Changeset 758

Timestamp:

12/15/09 13:41:24 (3 years ago)

Author:

pablo

Message:

Branching off 4.7 dvr changes

Location:

trunk/as3

Files:

• com/jeroenwijering/models/RTMPModel.as (modified) (8 diffs)
• com/jeroenwijering/player/Player.as (modified) (1 diff)
• player.swf (modified) (previous)

trunk/as3/com/jeroenwijering/models/RTMPModel.as

@@ -30 +30 @@
         /** Is dynamic streaming possible. **/
         private var dynamics:Boolean;
-        /** Duration of the DVR stream (grows with a timer). **/
-        private var dvrDuration:Number = 0;
-        /** Interval ID for griowing the DVR duration. **/
-        private var dvrInterval:Number;
         /** ID for the position interval. **/
         private var interval:Number;
@@ -96 +92 @@
 
 
-        /** If there's a DVR stream, we simply add up the time. **/
-        private function dvrPosition():void {
-                dvrDuration++;
-                if(model.config['duration'] && dvrDuration < model.config['duration']) {
-                        model.sendEvent(ModelEvent.LOADED,{loaded:dvrDuration,total:model.config['duration']});
-                } else if (!model.config['duration']) {
-                        item['duration'] = dvrDuration;
-                }
-        };
-
-
         /** Catch security errors. **/
         private function errorHandler(evt:ErrorEvent):void {
@@ -211 +196 @@
                         super.resize();
                 }
-                if(dat.duration) {
-                        if(model.config['rtmp.dvr'] || item['rtmp.dvr']) {
-                                // Save the DVR duration differently, adding a small buffer.
-                                dvrDuration = dat.duration + 3;
-                        } else if(!item['duration']) {
-                                item['duration'] = dat.duration;
-                        }
+                if(dat.duration && !item['duration']) {
+                        item['duration'] = dat.duration;
                 }
                 if(dat.type == 'complete') {
@@ -260 +240 @@
                 if(bfr < 0.25 && pos < item['duration']-5 && model.config['state'] != ModelStates.BUFFERING) {
                         model.sendEvent(ModelEvent.STATE,{newstate:ModelStates.BUFFERING});
+                        stream.bufferTime = model.config['bufferlength'];
                 } else if (bfr > 1 && model.config['state'] != ModelStates.PLAYING) {
                         model.sendEvent(ModelEvent.STATE,{newstate:ModelStates.PLAYING});
+                        stream.bufferTime = model.config['bufferlength']*4;
                 }
                 if(model.config['state'] != ModelStates.PLAYING) {
@@ -272 +254 @@
                         stream.pause();
                         clearInterval(interval);
+                        if(stream && item['duration'] == 0) { stop(); }
                         model.sendEvent(ModelEvent.STATE,{newstate:ModelStates.COMPLETED});
                 }
@@ -298 +281 @@
                 clearInterval(interval);
                 clearInterval(bwinterval);
-                clearInterval(dvrInterval);
                 interval = setInterval(positionInterval,100);
                 if(item['levels'] && getLevel() != model.config['level']) {
@@ -315 +297 @@
                         stream.play(getID(item['file']));
                 } else if(model.config['rtmp.dvr'] || item['rtmp.dvr']) {
-                        if(model.config['state'] != ModelStates.PLAYING) {
-                                stream.play(getID(item['file']),0,-1);
-                        }
+                        stream.play(getID(item['file']),0,-1);
+                } else {
+                        stream.play(getID(item['file']));
                         if(timeoffset) { stream.seek(timeoffset); }
-                        dvrInterval = setInterval(dvrPosition,1000);
-                } else {
-                        if(model.config['state'] != ModelStates.PLAYING) {
-                                stream.play(getID(item['file']));
-                        }
-                        if(timeoffset) {
-                                stream.seek(timeoffset);
-                        }
                         if(dynamics) {
                                 bwinterval = setInterval(getBandwidth,2000);
@@ -430 +404 @@
                 clearInterval(interval);
                 clearInterval(bwinterval);
-                clearInterval(dvrInterval);
                 position = 0;
                 timeoffset = item['start'];

trunk/as3/com/jeroenwijering/player/Player.as

@@ -69 +69 @@
                 id:undefined,
                 plugins:undefined,
-                version:'4.7.707'
+                version:'4.7.758'
         };
         /** Reference to all stage graphics. **/