Changeset 45 for trunk/as3/com/jeroenwijering/models/HTTPModel.as

Timestamp:

07/22/08 17:24:41 (5 years ago)

Author:

jeroen

Message:

fixed a string of bugs (see trac), notably yt-nosound, no metadata = no video and rtmp folder structures

File:

• trunk/as3/com/jeroenwijering/models/HTTPModel.as (modified) (4 diffs)

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

@@ -8 +8 @@
 import com.jeroenwijering.models.ModelInterface;
 import com.jeroenwijering.player.Model;
+import com.jeroenwijering.utils.NetClient;
 import flash.events.*;
 import flash.display.DisplayObject;
@@ -59 +60 @@
                 stream.addEventListener(AsyncErrorEvent.ASYNC_ERROR,metaHandler);
                 stream.bufferTime = model.config['bufferlength'];
-                stream.client = this;
+                stream.client = new NetClient(this);
                 video = new Video(320,240);
                 video.attachNetStream(stream);
@@ -80 +81 @@
                 var off = 0;
                 if(keyframes === null) {
-                        errorHandler(new ErrorEvent(ErrorEvent.ERROR,false,false,"This file has no seekpoints metadata."));
-                        return 0;
+                        return off;
                 }
                 for (var i=0; i< keyframes.times.length; i++) {
@@ -146 +146 @@
 
 
-        /** Get textdata from netstream. **/
-        public function onImageData(info:Object) {
-                var dat = new Object();
-                for(var i in info) { 
-                        dat[i] = info[i];
-                }
-                model.sendEvent(ModelEvent.META,dat);
-        };
-
-
         /** Get metadata information from netstream class. **/
-        public function onMetaData(info:Object) {
-                if(h264) { return; }
-                if(info.width) {
-                        video.width = info.width;
-                        video.height = info.height;
-                        model.mediaHandler(video);
-                } else if(info.videodatarate) {
-                        video.width = 320;
-                        video.height = 240;
-                        model.mediaHandler(video);
-                } else { 
-                        model.mediaHandler();
-                }
-                if(info.seekpoints) {
-                        h264 = true;
-                        keyframes = new Object();
-                        keyframes.times = new Array();
-                        keyframes.filepositions = new Array();
-                        for (var j in info.seekpoints) {
-                                keyframes.times.push(Number(info.seekpoints[j]['time']));
-                                keyframes.filepositions.push(Number(info.seekpoints[j]['offset']));
-                        }
-                } else if(info.keyframes) {
-                        keyframes = info.keyframes;
-                }
-                var dat = new Object();
-                for(var i in info) {
-                        dat[i] = info[i];
-                }
-                if(keyframes) { 
-                        delete dat.seekpoints;
-                        dat.keyframes = '';
-                        for(var k=0; k<keyframes.times.length; k++) {
-                                dat['keyframes'] += ','+keyframes.times[k]+':'+keyframes.filepositions[k];
-                        }
-                }
-                model.sendEvent(ModelEvent.META,dat);
-                if(model.playlist[model.config['item']]['start'] > 0) {
-                        seek(model.playlist[model.config['item']]['start']);
-                }
-        };
-
-
-        /** Get textdata from netstream. **/
-        public function onTextData(info:Object) {
-                var dat = new Object();
-                for(var i in info) { 
-                        dat[i] = info[i];
+        public function onData(dat:Object) {
+                if(dat.type == 'metadata' && !h264) {
+                        if(dat.width) {
+                                video.width = dat.width;
+                                video.height = dat.height;
+                                model.mediaHandler(video);
+                        } else {
+                                model.mediaHandler();
+                        }
+                        if(dat.seekpoints) {
+                                h264 = true;
+                                keyframes = new Object();
+                                keyframes.times = new Array();
+                                keyframes.filepositions = new Array();
+                                for (var j in dat.seekpoints) {
+                                        keyframes.times.push(Number(dat.seekpoints[j]['time']));
+                                        keyframes.filepositions.push(Number(dat.seekpoints[j]['offset']));
+                                }
+                        } else if(dat.keyframes) {
+                                keyframes = dat.keyframes;
+                        }
+                        if(keyframes) {
+                                delete dat.seekpoints;
+                                dat.keyframes = '';
+                                for(var k=0; k<keyframes.times.length; k++) {
+                                        dat['keyframes'] += ','+keyframes.times[k]+':'+keyframes.filepositions[k];
+                                }
+                        }
+                        if(model.playlist[model.config['item']]['start'] > 0) {
+                                seek(model.playlist[model.config['item']]['start']);
+                        }
                 }
                 model.sendEvent(ModelEvent.META,dat);