Merge remote-tracking branch 'origin/develop-7.0' into merge-develop_7.0-16.06.15

runrevmark · runrevmark · commit 757de8e3ef67 · 2015-06-16T12:05:47.000+01:00
Conflicts:
	docs/dictionary/property/dontUseQT.xml
	engine/src/exec-keywords.cpp
	engine/src/foundation-legacy.cpp
	ide
	libfoundation/src/foundation-number.cpp
diff --git a/docs/notes/bugfix-12834.md b/docs/notes/bugfix-12834.md
@@ -0,0 +1 @@
+#     [[Player]] enhancement set colour of player controller buttons using backcolor property
diff --git a/docs/notes/bugfix-13390.md b/docs/notes/bugfix-13390.md
@@ -0,0 +1 @@
+#     [[Player]] foregroundColor and hiliteColor not saved with stack
diff --git a/docs/notes/bugfix-13391.md b/docs/notes/bugfix-13391.md
@@ -0,0 +1 @@
+#     [[Player]] Make default foregroundColor a colour a colour other than black
diff --git a/docs/notes/bugfix-15439.md b/docs/notes/bugfix-15439.md
@@ -0,0 +1 @@
+#    enabledTracks "can't set this property" in LC 7
diff --git a/docs/notes/bugfix-15457.md b/docs/notes/bugfix-15457.md
@@ -0,0 +1 @@
+# Repeat for each element subtly different in 7.0
diff --git a/docs/notes/bugfix-15472.md b/docs/notes/bugfix-15472.md
@@ -0,0 +1 @@
+#     Invisible player appears and causes LC to hang 
diff --git a/docs/notes/bugfix-15494.md b/docs/notes/bugfix-15494.md
@@ -0,0 +1 @@
+#    mobileControlget ID,"URL" crashes 
diff --git a/docs/notes/bugfix-15495.md b/docs/notes/bugfix-15495.md
@@ -0,0 +1 @@
+#     [Player] Progress Bar does not update when playing audio files and alwaysBuffer is true
diff --git a/docs/notes/bugfix-5209.md b/docs/notes/bugfix-5209.md
@@ -0,0 +1 @@
+#    FormattedHeight does not take into account controller
diff --git a/docs/notes/feature-avfoundation_player.md b/docs/notes/feature-avfoundation_player.md
@@ -3,12 +3,14 @@
 **What has changed?**
 
 The player object until now used QuickTime/QTKit APIs for audio and video playback. Since both QuickTime and QTKit have been deprecated by Apple, we have updated the player to use the new AVFoundation API. AVFoundation does not provide a controller for multimedia playback until OSX 10.9 and their new control bar is also missing some of the features provided by the QTKIt controller, which required us to implement our own controller to ensure backward compatibility. 
-We have added two new properties to the player object enabling you to customise the appearance of the controller:
+We have added three new properties to the player object enabling you to customise the appearance of the controller:
 
 - The **hilitecolor** of a player is the color of the played area, the colour of the volume area, as well as the background color of a controller button when it is pressed.
 
 - The **forecolor** of a player is the color of the selected area. The selected area is the area between the selection handles.
 
+- The **backcolor** of a player is the color of the controller icons (volume icon, play/pause icon, scrub back/scrub forward icon).
+
 We have also added support for getting information about the download progress of a remote multimedia file:
 
 - The **loadedtime** of a player is the time up to which the movie can be played. The download progress is also displayed on the controller well.
diff --git a/engine/src/exec-interface-player.cpp b/engine/src/exec-interface-player.cpp
@@ -727,26 +727,11 @@ void MCPlayer::GetEnabledTracks(MCExecContext& ctxt, uindex_t& r_count, uinteger
     getenabledtracks(r_count, r_tracks);
 }
 
-void MCPlayer::GetForeColor(MCExecContext &ctxt, MCInterfaceNamedColor &r_color)
+void MCPlayer::SetEnabledTracks(MCExecContext& ctxt, uindex_t p_count, uinteger_t* p_tracks)
 {
-    getforegrouncolor(r_color);
-}
-
-void MCPlayer::SetForeColor(MCExecContext &ctxt, const MCInterfaceNamedColor &p_color)
-{
-    setforegroundcolor(p_color);
-    Redraw();
-}
-
-void MCPlayer::GetHiliteColor(MCExecContext &ctxt, MCInterfaceNamedColor &r_color)
-{
-    gethilitecolor(r_color);
-}
-
-void MCPlayer::SetHiliteColor(MCExecContext &ctxt, const MCInterfaceNamedColor &p_color)
-{
-    sethilitecolor(p_color);
-    Redraw();
+    // PM-2015-06-01: [[ PlatformPlayer ]]
+    // P_ENABLED_TRACKS setter refactored to the MCPlayer implementations
+    setenabledtracks(p_count, p_tracks);
 }
 
 #ifdef FEATURE_PLATFORM_PLAYER
diff --git a/engine/src/exec-keywords.cpp b/engine/src/exec-keywords.cpp
@@ -385,7 +385,9 @@ void MCKeywordsExecRepeatFor(MCExecContext& ctxt, MCStatement *statements, MCExp
 	MCNameRef t_key;
 	MCValueRef t_value;
 	uintptr_t t_iterator;
-    const byte_t *t_data_ptr;
+    // SN2015-06-15: [[ Bug 15457 ]] The index can be a negative index.
+    index_t t_sequenced_iterator;
+    const byte_t *t_data_ptr, *t_data_end;
     Parse_stat ps;
     MCScriptPoint *sp = nil;
     int4 count = 0;
@@ -405,12 +407,12 @@ void MCKeywordsExecRepeatFor(MCExecContext& ctxt, MCStatement *statements, MCExp
             if (!ctxt . ConvertToArray(*t_condition, &t_array))
                 return;
             
-            // If this is a numerical array, do it in order
-            if (each == FU_ELEMENT && MCArrayIsSequence(*t_array))
+            // SN-2015-06-15: [[ Bug 15457 ]] If this is a numerical array, do
+            //  it in order - even if it does not start at 1
+            if (each == FU_ELEMENT && MCArrayIsNumericSequence(*t_array, t_sequenced_iterator))
             {
                 t_sequence_array = true;
-                t_iterator = 1;
-                if (!MCArrayFetchValueAtIndex(*t_array, t_iterator, t_value))
+                if (!MCArrayFetchValueAtIndex(*t_array, t_sequenced_iterator, t_value))
                     return;
             }
             else
@@ -512,9 +514,11 @@ void MCKeywordsExecRepeatFor(MCExecContext& ctxt, MCStatement *statements, MCExp
                 case FU_ELEMENT:
                 {
                     loopvar -> set(ctxt, t_value);
+                    // SN-2015-06-15: [[ Bug 15457 ]] Sequenced, numeric arrays
+                    //  have their own iterator
                     if (t_sequence_array)
                     {
-                        if (!MCArrayFetchValueAtIndex(*t_array, ++t_iterator, t_value))
+                        if (!MCArrayFetchValueAtIndex(*t_array, ++t_sequenced_iterator, t_value))
                             endnext = true;
                     }
                     else
diff --git a/engine/src/exec-multimedia.cpp b/engine/src/exec-multimedia.cpp
@@ -652,7 +652,7 @@ void MCMultimediaExecPlayOperation(MCExecContext& ctxt, MCPlayer *p_player, int
 {
 	if (p_player != nil)
 	{	
-		p_player->setflag(True, F_VISIBLE);
+		// PM-2015-07-10: [[ Bug 15472 ]] Preserve the visible/invisible state of the player
 		switch (p_operation)
 		{
 		case PP_FORWARD:
diff --git a/engine/src/foundation-legacy.cpp b/engine/src/foundation-legacy.cpp
@@ -1180,6 +1180,14 @@ bool MCNameGetAsIndex(MCNameRef p_name, index_t& r_index)
     if (MCStringGetLength(t_key) != 1 && MCStringGetCodepointAtIndex(t_key, 0) == '0')
         return false;
     
+    // SN-2015-05-15: [[ Bug 15457 ]] Store the string-to-number conversion.
+    double t_double_index;
+    if (MCStringGetNumericValue(t_key, t_double_index))
+    {
+        r_index = (index_t)t_double_index;
+        return true;
+    }
+    
 	char *t_end;
 	index_t t_index;
     
@@ -1191,6 +1199,9 @@ bool MCNameGetAsIndex(MCNameRef p_name, index_t& r_index)
 	t_index = strtol(*t_cstring, &t_end, 10);
 	if (*t_end == '\0')
 	{
+        // SN-2015-06-15: [[ Bug 15457 ]] Store the converted value - improve
+        //  speed if repeating several times over the elements of a array.
+        MCStringSetNumericValue(t_key, t_index);
 		r_index = t_index;
 		return true;
 	}
@@ -1274,12 +1285,26 @@ static bool get_array_extent(void *context, MCArrayRef p_array, MCNameRef p_key,
 
 bool MCArrayIsSequence(MCArrayRef self)
 {
-	get_array_extent_context_t ctxt;
-	ctxt . minimum = INDEX_MAX;
-	ctxt . maximum = INDEX_MIN;
-	return MCArrayApply(self, get_array_extent, &ctxt) &&
-			ctxt . minimum == 1 &&
-			(uindex_t) (ctxt . maximum - ctxt . minimum + 1) == MCArrayGetCount(self);
+    int32_t t_start_index;
+    
+    // IsSequence returns true if the sequence starts with 1 only
+    return MCArrayIsNumericSequence(self, t_start_index) && t_start_index == 1;
+}
+
+bool MCArrayIsNumericSequence(MCArrayRef self, int32_t &r_start_index)
+{
+    get_array_extent_context_t ctxt;
+    ctxt . minimum = INDEX_MAX;
+    ctxt . maximum = INDEX_MIN;
+    
+    if (MCArrayApply(self, get_array_extent, &ctxt) &&
+            (ctxt . maximum - ctxt . minimum + 1) == MCArrayGetCount(self))
+    {
+        r_start_index = ctxt . minimum;
+        return true;
+    }
+    
+    return false;
 }
 
 static bool list_keys(void *p_context, MCArrayRef p_array, MCNameRef p_key, MCValueRef p_value)
diff --git a/engine/src/foundation-legacy.h b/engine/src/foundation-legacy.h
@@ -115,6 +115,10 @@ class MCObjectOutputStream;
 // with no holes).
 bool MCArrayIsSequence(MCArrayRef array);
 
+// SN-2015-06-15: [[ Bug 15457 ]] Returns true if the array a dense, numeric
+//  sequence - but does not have to start with 1.
+bool MCArrayIsNumericSequence(MCArrayRef self, index_t &r_start_index);
+
 // Constructs a string containing the list of all keys in the array separated by
 // the given delimiter.
 bool MCArrayListKeys(MCArrayRef array, char delimiter, MCStringRef& r_list);
diff --git a/engine/src/lextable.cpp b/engine/src/lextable.cpp
@@ -1524,7 +1524,6 @@ LT factor_table[] =
         {"segmentoffset", TT_FUNCTION, F_WORD_OFFSET},
         {"segments", TT_CLASS, CT_WORD},
         {"selected", TT_PROPERTY, P_SELECTED},
-        //{"selectedareacolor", TT_PROPERTY, P_SELECTED_AREA_COLOR},
         {"selectedbutton", TT_FUNCTION, F_SELECTED_BUTTON},
         {"selectedchunk", TT_FUNCTION, F_SELECTED_CHUNK},
         {"selectedcolor", TT_PROPERTY, P_SELECTED_COLOR},
diff --git a/engine/src/mac-av-player.mm b/engine/src/mac-av-player.mm
@@ -512,7 +512,17 @@ - (void)setPlayer:(AVPlayer *)player
                                 void *displayLinkContext)
 {
     MCAVFoundationPlayer *t_self = (MCAVFoundationPlayer *)displayLinkContext;
-        
+    
+    // PM-2015-06-12: [[ Bug 15495 ]] If the file has no video component, then just update the currentTime (no need to updateCurrentFrame, since there are no frames)
+    bool t_has_video;
+    t_has_video = ( [[[[t_self -> m_player currentItem] asset] tracksWithMediaType:AVMediaTypeVideo] count] != 0);
+    
+    if (!t_has_video)
+    {
+        t_self -> HandleCurrentTimeChanged();
+        return kCVReturnSuccess;
+    }
+    
     CMTime t_output_item_time = [t_self -> m_player_item_video_output itemTimeForCVTimeStamp:*inOutputTime];
     
     if (![t_self -> m_player_item_video_output hasNewPixelBufferForItemTime:t_output_item_time])
diff --git a/engine/src/mblandroidbrowser.cpp b/engine/src/mblandroidbrowser.cpp
@@ -196,7 +196,8 @@ void MCAndroidBrowserControl::GetUrl(MCExecContext& ctxt, MCStringRef& r_url)
     MCAutoStringRef t_url;
     if (t_view != nil)
     {
-        MCAndroidObjectRemoteCall(t_view, "getUrl", "x", &t_url);
+        // PM-2015-06-12: [[ Bug 15494 ]] return type is stringref
+        MCAndroidObjectRemoteCall(t_view, "getUrl", "x", &(&t_url));
         r_url = MCValueRetain(*t_url);
     }
 }
diff --git a/engine/src/player-interface.h b/engine/src/player-interface.h
@@ -108,7 +108,6 @@ class MCPlayerInterface
 	virtual MCRectangle getpreferredrect() = 0;
 	virtual uint2 getloudness() = 0;
 	virtual void setloudness() = 0;
-	virtual Boolean setenabledtracks(MCStringRef s) = 0;
     
 #ifdef LEGACY_EXEC
 	void gettracks(MCExecPoint &ep);
@@ -184,15 +183,10 @@ class MCPlayerInterface
     virtual void gethotspots(MCStringRef &r_nodes) = 0;
     virtual void getconstraints(MCMultimediaQTVRConstraints &r_constraints) = 0;
     virtual void getenabledtracks(uindex_t &r_count, uint32_t *&r_tracks_id) = 0;
+    virtual void setenabledtracks(uindex_t p_count, uint32_t *p_tracks_id) = 0;
+    
     virtual void updatevisibility() = 0;
     virtual void updatetraversal() = 0;
-    
-    // SN-2014-07-03: [[ PlatformPlayer ]]
-    // New properties P_FORE_COLOR and P_HILITE_COLOR added for the player
-    virtual void setforegroundcolor(const MCInterfaceNamedColor& p_color) = 0;
-    virtual void getforegrouncolor(MCInterfaceNamedColor& r_color) = 0;
-    virtual void sethilitecolor(const MCInterfaceNamedColor& p_color) = 0;
-    virtual void gethilitecolor(MCInterfaceNamedColor& r_color) = 0;    
 
     // SN-2015-01-06: [[ Merge-6.7.2-rc-1 ]] Update to MCStringRef
     virtual bool resolveplayerfilename(MCStringRef p_filename, MCStringRef &r_filename) = 0;
@@ -266,11 +260,7 @@ class MCPlayerInterface
     virtual void SetTraversalOn(MCExecContext& ctxt, bool setting) = 0;
     
     virtual void GetEnabledTracks(MCExecContext& ctxt, uindex_t& r_count, uinteger_t*& r_tracks) = 0;
-    
-    virtual void SetForeColor(MCExecContext& ctxt, const MCInterfaceNamedColor& p_color) = 0;
-    virtual void GetForeColor(MCExecContext& ctxt, MCInterfaceNamedColor& r_color) = 0;
-    virtual void SetHiliteColor(MCExecContext& ctxt, const MCInterfaceNamedColor& p_color) = 0;
-    virtual void GetHiliteColor(MCExecContext& ctxt, MCInterfaceNamedColor& r_color) = 0;
+    virtual void SetEnabledTracks(MCExecContext& ctxt, uindex_t p_count, uinteger_t* p_tracks) = 0;
     
     virtual void GetDontUseQT(MCExecContext& ctxt, bool &p_dont_use_qt) = 0;
     virtual void SetDontUseQT(MCExecContext& ctxt, bool r_dont_use_qt) = 0;
diff --git a/engine/src/player-legacy.cpp b/engine/src/player-legacy.cpp
diff --git a/engine/src/player-legacy.h b/engine/src/player-legacy.h
diff --git a/engine/src/player-platform.cpp b/engine/src/player-platform.cpp
diff --git a/engine/src/player-platform.h b/engine/src/player-platform.h
diff --git a/engine/src/player.cpp b/engine/src/player.cpp
diff --git a/engine/src/props.cpp b/engine/src/props.cpp
diff --git a/libfoundation/src/foundation-number.cpp b/libfoundation/src/foundation-number.cpp

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# [[Player]] enhancement set colour of player controller buttons using backcolor property`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# [[Player]] foregroundColor and hiliteColor not saved with stack`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# [[Player]] Make default foregroundColor a colour a colour other than black`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# enabledTracks "can't set this property" in LC 7`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Repeat for each element subtly different in 7.0`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Invisible player appears and causes LC to hang`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# [Player] Progress Bar does not update when playing audio files and alwaysBuffer is true`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# FormattedHeight does not take into account controller`