Merge branch 'bugfix-13119' into develop

runrevmark · runrevmark · commit b9e3bf557081 · 2014-10-09T10:51:33.000+01:00
diff --git a/docs/notes/feature-avfoundation_player.md b/docs/notes/feature-avfoundation_player.md
@@ -18,4 +18,7 @@ You can also query the **status** property of the player. This property can take
 - **playing**
 - **paused**
 
+A new message is added to the player:
+- The **playRateChanged** message is sent to the player when the rate is changed by the rate scrollbar controller. To enable the rate scrollbar controller, hold shift + click on scrubForward/scrubBack buttons of the player controller.
+
 Note AVFoundation player is supported in OSX 10.8 and above. On systems running OSX 10.6 and 10.7, LiveCode continues to provide player functionality using the QTKit API.
diff --git a/engine/src/mcstring.cpp b/engine/src/mcstring.cpp
@@ -305,6 +305,7 @@ MCNameRef MCM_open_stack;
 MCNameRef MCM_option_key_down;
 MCNameRef MCM_paste_key;
 MCNameRef MCM_play_paused;
+MCNameRef MCM_play_rate_changed;
 MCNameRef MCM_play_started;
 MCNameRef MCM_play_stopped;
 MCNameRef MCM_post_url;
@@ -590,6 +591,7 @@ void MCU_initialize_names(void)
 	/* UNCHECKED */ MCNameCreateWithCString("optionKeyDown", MCM_option_key_down);
 	/* UNCHECKED */ MCNameCreateWithCString("pasteKey", MCM_paste_key);
 	/* UNCHECKED */ MCNameCreateWithCString("playPaused", MCM_play_paused);
+    /* UNCHECKED */ MCNameCreateWithCString("playRateChanged", MCM_play_rate_changed);
 	/* UNCHECKED */ MCNameCreateWithCString("playStarted", MCM_play_started);
 	/* UNCHECKED */ MCNameCreateWithCString("playStopped", MCM_play_stopped);
 	/* UNCHECKED */ MCNameCreateWithCString("postURL", MCM_post_url);
@@ -875,6 +877,7 @@ void MCU_finalize_names(void)
 	MCNameDelete(MCM_option_key_down);
 	MCNameDelete(MCM_paste_key);
 	MCNameDelete(MCM_play_paused);
+    MCNameDelete(MCM_play_rate_changed);
 	MCNameDelete(MCM_play_started);
 	MCNameDelete(MCM_play_stopped);
 	MCNameDelete(MCM_post_url);
diff --git a/engine/src/mcstring.h b/engine/src/mcstring.h
@@ -258,6 +258,7 @@ extern MCNameRef MCM_open_stack;
 extern MCNameRef MCM_option_key_down;
 extern MCNameRef MCM_paste_key;
 extern MCNameRef MCM_play_paused;
+extern MCNameRef MCM_play_rate_changed;
 extern MCNameRef MCM_play_started;
 extern MCNameRef MCM_play_stopped;
 extern MCNameRef MCM_post_url;
diff --git a/engine/src/player-platform.cpp b/engine/src/player-platform.cpp
@@ -517,6 +517,7 @@ class MCPlayerRatePopup: public MCStack
         m_font = nil;
         
         m_player = nil;
+        m_grabbed_part = -1;
     }
     
     ~MCPlayerRatePopup(void)
@@ -732,6 +733,9 @@ class MCPlayerRatePopup: public MCStack
     
     Boolean mup(uint2 which, bool release)
     {
+        // PM-2014-09-30: [[ Bug 13119 ]] Make sure a playRateChanged message is sent when the mouse is up/released, but not when creating the ratepopup
+        if (m_grabbed_part != -1)
+            m_player -> timer(MCM_play_rate_changed,nil);
         m_grabbed_part = kMCPlayerControllerPartUnknown;
         return True;
     }

Original file line number	Diff line number	Diff line change
`@@ -517,6 +517,7 @@ class MCPlayerRatePopup: public MCStack`
`517`	`517`	`m_font = nil;`
`518`	`518`
`519`	`519`	`m_player = nil;`
	`520`	`+ m_grabbed_part = -1;`
`520`	`521`	`}`
`521`	`522`
`522`	`523`	`~MCPlayerRatePopup(void)`
`@@ -732,6 +733,9 @@ class MCPlayerRatePopup: public MCStack`
`732`	`733`
`733`	`734`	`Boolean mup(uint2 which, bool release)`
`734`	`735`	`{`
	`736`	`+ // PM-2014-09-30: [[ Bug 13119 ]] Make sure a playRateChanged message is sent when the mouse is up/released, but not when creating the ratepopup`
	`737`	`+ if (m_grabbed_part != -1)`
	`738`	`+ m_player -> timer(MCM_play_rate_changed,nil);`
`735`	`739`	`m_grabbed_part = kMCPlayerControllerPartUnknown;`
`736`	`740`	`return True;`
`737`	`741`	`}`