Merge pull request #18 from flowplayer/danielr-core

- #615 dispatch begin if in paused mode too early.

core/README.txt

@@ -7,6 +7,9 @@ Version history:
 - #627 re-enable stagevideo state change listeners if stagevideo is available or detach the fullscreen events on first call.
 - #9 when replaying from stopping, connection does not receive callbacks anymore.
 - #15 fixes for #627, handle the display init on startup.
+- #615 dispatch begin if in paused mode too early.
+- #629 if start has been dispatched already prevent dispatching many begin events.
+- #20 for the free player swap the logo with the stage video mask to display underneath not on top.
 
 3.2.13
 ------

core/src/actionscript/org/flowplayer/controller/NetStreamControllingStreamProvider.as

@@ -754,7 +754,9 @@ package org.flowplayer.controller {
             } else if (event.info.code == "NetStream.Buffer.Full") {
                 dispatchPlayEvent(ClipEventType.BUFFER_FULL);
             } else if (event.info.code == "NetStream.Play.Start") {
-                if (! _paused && canDispatchBegin()) {
+                //#615 dispatch begin if in paused mode too early.
+                //#629 if start has been dispatched already prevent dispatching many begin events.
+                if (canDispatchBegin() && !clip.startDispatched) {
                     log.debug("dispatching onBegin");
                     clip.dispatchEvent(new ClipEvent(ClipEventType.BEGIN, _pauseAfterStart));
                 }

core/src/actionscript/org/flowplayer/view/Launcher.as

@@ -775,7 +775,12 @@ import org.flowplayer.model.DisplayPluginModel;
                     if ( ! contains(_screenMask) ) {
                         //#508 stage video mask was being added to the top layer and hiding all children.
                         addChildAt(_screenMask, 0);
-                        //addChildAt(_screenMask, _canvasLogo ? getChildIndex(_canvasLogo) + 1 : 1);
+
+                        //#20 for the free player swap the logo with the stage video mask to display underneath not on top.
+                        CONFIG::freeVersion {
+                            swapChildren(_screenMask,  _canvasLogo);
+                        }
+                        //addChildAt(_screenMask, _canvasLogo ? 1 : 0);
                         log.debug("adding mask");
                     }
 

plugins/captions/build.xml

@@ -14,7 +14,7 @@
 	<property name="plugin-binary-versioned" value="${basename}-${version}.swf" />
 	<property name="plugin-swc" value="${basename}.swc" />
 	
-	<property name="plugin-main-class" value="org/flowplayer/captions/Caption.as" />
+	<property name="plugin-main-class" value="org/flowplayer/captions/CaptionPluginFactory.as" />
 
 	<target name="release" description="makes a release" depends="build">
 		<copyrelease targetdir="flowplayer.captions">

plugins/cluster/README.txt

@@ -3,6 +3,7 @@ Version history:
 3.2.4
 -----
 - #601 dispatch resolver failure correctly.
+- #15 add cache busting to the file being checked for availability to play back correctly once resolving has completed.
 
 3.2.3
 -----