Commit cba60886 authored by Dan Rossi's avatar Dan Rossi
Browse files

- #42 pass in stream clips through and close the stream before returning to the parent clip.

- #42 when returning and resuming from an instream clip, restart the time update timer.
parent d9835061
......@@ -10,6 +10,7 @@ Version history:
- #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.
- #42 pass in stream clips through and close the stream before returning to the parent clip.
3.2.13
------
......
......@@ -139,9 +139,10 @@ package org.flowplayer.controller {
});
//#614 when the clip ends if the next clip in the provider has a different provider close the provider stream.
clip.onFinish(closeStream, function():Boolean {
clip.onFinish(closeStream, function(clip:Clip):Boolean {
//#42 pass instream clips through and close the stream
if (clip.isInStream) return true;
return _player.playlist.hasNext() && _player.playlist.nextClip.provider !== _model.name;
});
clip.startDispatched = false;
......@@ -164,7 +165,7 @@ package org.flowplayer.controller {
*/
private function closeStream(event:ClipEvent):void
{
netStream.close();
if (netStream) netStream.close();
_startedClip = null;
event.target.unbind(closeStream);
}
......
......@@ -3,6 +3,7 @@ Version history:
3.2.14
------
- #624 if there are alpha or opacity changes in a css call update the autohide original display properties.
- #42 when returning and resuming from an instream clip, restart the time update timer.
3.2.13
------
......
......@@ -110,6 +110,10 @@ package org.flowplayer.controls.scrubber {
override protected function onPlayResumed(event:ClipEvent):void {
super.onPlayResumed(event);
//#42 when returning and resuming from an instream clip, restart the time update timer.
if (!_timeUpdateTimer.running) _timeUpdateTimer.start();
log.info("received " + event + ", time " + _player.status.time);
if (_player.status.time < 0.5) {
if (_enableOnStart) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment