Changeset 104

Timestamp:

11/06/08 13:25:45 (5 years ago)

Author:

jeroen

Message:

added HD switch plugin (and fixed a bug in the LOAD event

Location:

trunk/as3

Files:

• com/jeroenwijering/models/HTTPModel.as (modified) (1 diff)
• com/jeroenwijering/models/VideoModel.as (modified) (1 diff)
• com/jeroenwijering/player/Controller.as (modified) (2 diffs)
• com/jeroenwijering/player/Model.as (modified) (4 diffs)
• com/jeroenwijering/player/Player.as (modified) (1 diff)
• com/jeroenwijering/player/SPLoader.as (modified) (2 diffs)
• com/jeroenwijering/plugins/HD.as (added)
• hd.fla (added)
• hd.swf (added)
• player.fla (modified) (previous)
• player.swf (modified) (previous)

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

@@ -256 +256 @@
                 h264 = false;
                 keyframes = undefined;
+                metadata = false;
                 if(stream.bytesLoaded != stream.bytesTotal) {
                         stream.close();

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

@@ -163 +163 @@
         /** Destroy the video. **/
         public function stop():void {
+                stream.pause();
                 if(stream.bytesLoaded != stream.bytesTotal) {
                         stream.close();
                 }
-                stream.pause();
                 metadata = false;
                 clearInterval(loadinterval);

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

@@ -177 +177 @@
                         var arr:Array = new Array();
                         for each(var itm:Object in obj) {
-                                arr.push(ObjectParser.parse(obj));
+                                arr.push(ObjectParser.parse(itm));
                         }
                         playlistHandler(arr);
@@ -297 +297 @@
                         playlist = ply;
                 } else {
-                        dispatchEvent(new ControllerEvent(ControllerEvent.ERROR,'No valid filetypes found in this playlist'));
+                        dispatchEvent(new ControllerEvent(ControllerEvent.ERROR,{message:'No valid filetypes found in this playlist'}));
                         return;
                 }

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

@@ -28 +28 @@
         /** The list with all active models. **/
         private var models:Object;
-        /** Currently active model. **/
-        private var currentModel:String;
-        /** Currently active mediafile. **/
-        private var currentURL:String;
         /** Loader for the preview image. **/
         private var thumb:Loader;
         /** Save the current image to prevent overloading. **/
         private var image:String;
+        /** Currently active model. **/
+        private var currentModel:String;
 
 
@@ -63 +61 @@
         private function itemHandler(evt:ControllerEvent):void {
                 var typ:String = playlist[config['item']]['type'];
-                var url:String = playlist[config['item']]['file'];
-                if(typ == currentModel) {
-                        if(url == currentURL) {
-                                models[typ].seek(playlist[config['item']]['start']);
-                        } else {
-                                models[typ].stop();
-                                currentURL = url;
-                                models[typ].load();
-                        }
+                if(currentModel) {
+                        models[currentModel].stop();
+                }
+                if(!models[typ]) {
+                        loadModel(typ);
+                }
+                if(models[typ]) {
+                        currentModel = typ;
+                        models[typ].load();
                 } else {
-                        if(currentModel) {
-                                models[currentModel].stop();
-                        }
-                        if(!models[typ]) {
-                                loadModel(typ);
-                        }
-                        if(models[typ]) { 
-                                currentModel = typ;
-                                currentURL = url;
-                                models[typ].load();
-                        } else {
-                                sendEvent(ModelEvent.ERROR,{message:''});
-                                
-                        }
+                        sendEvent(ModelEvent.ERROR,{message:'No suiteable model found for playback.'});
                 }
                 thumbLoader();
@@ -185 +170 @@
         /** Load the configuration array. **/
         private function stopHandler(evt:ControllerEvent=undefined):void {
-                currentURL = undefined;
                 if(currentModel) {
                         models[currentModel].stop();
@@ -205 +189 @@
                                                 thumb.visible = true;
                                                 skin.display.media.visible = false;
-                                                sendEvent(ModelEvent.TIME,{
-                                                        position:playlist[config['item']]['start'],
-                                                        duration:playlist[config['item']]['duration']
-                                                });
+                                                sendEvent(ModelEvent.TIME,{position:0,duration:playlist[config['item']]['duration']});
                                                 break;
                                         case ModelStates.PLAYING:

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

@@ -67 +67 @@
                 token:undefined,
                 tracecall:undefined,
-                version:'4.3.101'
+                version:'4.3.103'
         };
         /** Reference to all stage graphics. **/

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

@@ -81 +81 @@
                 if(skn) {
                         ldr.contentLoaderInfo.addEventListener(IOErrorEvent.IO_ERROR,skinError);
-                        ldr.contentLoaderInfo.addEventListener(Event.INIT,skinHandler);
+                        ldr.contentLoaderInfo.addEventListener(Event.COMPLETE,skinHandler);
                 } else {
                         player.skin.addChild(ldr);
                         ldr.visible = false;
                         ldr.contentLoaderInfo.addEventListener(IOErrorEvent.IO_ERROR,pluginError);
-                        ldr.contentLoaderInfo.addEventListener(Event.INIT,pluginHandler);
+                        ldr.contentLoaderInfo.addEventListener(Event.COMPLETE,pluginHandler);
                 }
                 if(player.loaderInfo.url.indexOf('http') == 0) {
@@ -116 +116 @@
         /** Plugin loading completed; add to stage and populate. **/
         private function pluginHandler(evt:Event):void {
-                try { 
+                try {
                         evt.target.content.initializePlugin(player.view);
                         evt.target.loader.visible = true;