Changeset 57

Timestamp:

08/12/08 05:04:55 (5 years ago)

Author:

jeroen

Message:

added 3.17 rotator and :void returns to as3 functions

Files:

• tags/imagerotator-3-17.zip (added)
• trunk/as2/com/jeroenwijering/players/AbstractView.as (modified) (1 diff)
• trunk/as2/com/jeroenwijering/players/FLVModel.as (modified) (2 diffs)
• trunk/as2/com/jeroenwijering/players/ImageRotator.as (modified) (3 diffs)
• trunk/as2/com/jeroenwijering/players/JavascriptView.as (modified) (1 diff)
• trunk/as2/com/jeroenwijering/players/MediaPlayer.as (modified) (2 diffs)
• trunk/as2/com/jeroenwijering/players/PlayerController.as (modified) (1 diff)
• trunk/as2/com/jeroenwijering/players/RotatorController.as (modified) (3 diffs)
• trunk/as2/com/jeroenwijering/players/RotatorView.as (modified) (13 diffs)
• trunk/as2/com/jeroenwijering/utils/ImageLoader.as (modified) (3 diffs)
• trunk/as2/imagerotator.fla (modified) (previous)
• trunk/as2/imagerotator.html (added)
• trunk/as2/imagerotator.pdf (modified) (previous)
• trunk/as2/imagerotator.swf (modified) (previous)
• trunk/as2/madrid.xml (added)
• trunk/as2/madrid1.jpg (added)
• trunk/as2/madrid2.jpg (added)
• trunk/as2/madrid3.jpg (added)
• trunk/as2/mediaplayer.html (added)
• trunk/as2/mediaplayer.swf (modified) (previous)
• trunk/as2/readme.html (deleted)
• trunk/as3/com/jeroenwijering/events/AbstractView.as (modified) (1 diff)
• trunk/as3/com/jeroenwijering/events/ControllerEvent.as (modified) (1 diff)
• trunk/as3/com/jeroenwijering/events/ModelEvent.as (modified) (1 diff)
• trunk/as3/com/jeroenwijering/events/PluginInterface.as (modified) (1 diff)
• trunk/as3/com/jeroenwijering/events/ViewEvent.as (modified) (1 diff)
• trunk/as3/com/jeroenwijering/models/CameraModel.as (modified) (11 diffs)
• trunk/as3/com/jeroenwijering/models/HTTPModel.as (modified) (14 diffs)
• trunk/as3/com/jeroenwijering/models/ImageModel.as (modified) (12 diffs)
• trunk/as3/com/jeroenwijering/models/ModelInterface.as (modified) (1 diff)
• trunk/as3/com/jeroenwijering/models/RTMPModel.as (modified) (15 diffs)
• trunk/as3/com/jeroenwijering/models/SoundModel.as (modified) (11 diffs)
• trunk/as3/com/jeroenwijering/models/VideoModel.as (modified) (14 diffs)
• trunk/as3/com/jeroenwijering/models/YoutubeModel.as (modified) (14 diffs)
• trunk/as3/com/jeroenwijering/parsers/SMILParser.as (modified) (1 diff)
• trunk/as3/com/jeroenwijering/player/Controller.as (modified) (21 diffs)
• trunk/as3/com/jeroenwijering/player/Model.as (modified) (15 diffs)
• trunk/as3/com/jeroenwijering/player/Player.as (modified) (6 diffs)
• trunk/as3/com/jeroenwijering/player/SWFLoader.as (modified) (8 diffs)
• trunk/as3/com/jeroenwijering/player/View.as (modified) (14 diffs)
• trunk/as3/com/jeroenwijering/plugins/Captions.as (modified) (8 diffs)
• trunk/as3/com/jeroenwijering/plugins/Controlbar.as (modified) (18 diffs)
• trunk/as3/com/jeroenwijering/plugins/Display.as (modified) (9 diffs)
• trunk/as3/com/jeroenwijering/plugins/Playlist.as (modified) (20 diffs)
• trunk/as3/com/jeroenwijering/utils/Animations.as (modified) (6 diffs)
• trunk/as3/com/jeroenwijering/utils/Configger.as (modified) (6 diffs)
• trunk/as3/com/jeroenwijering/utils/Draw.as (modified) (1 diff)
• trunk/as3/com/jeroenwijering/utils/NetClient.as (modified) (13 diffs)
• trunk/as3/com/jeroenwijering/utils/Playlister.as (modified) (6 diffs)
• trunk/as3/com/jeroenwijering/utils/Randomizer.as (modified) (1 diff)
• trunk/as3/com/jeroenwijering/utils/Stacker.as (modified) (8 diffs)
• trunk/as3/com/jeroenwijering/utils/Stretcher.as (modified) (1 diff)
• trunk/as3/com/jeroenwijering/utils/TEA.as (modified) (1 diff)
• trunk/as3/player.swf (modified) (previous)

trunk/as2/com/jeroenwijering/players/AbstractView.as

@@ -85 +85 @@
         /** Send event to the controller. **/
         private function sendEvent(typ:String,prm:Number) {
-                controller.getEvent(typ,prm); 
+                controller.getEvent(typ,prm);
         };
 

trunk/as2/com/jeroenwijering/players/FLVModel.as

@@ -94 +94 @@
                 if(pos < 1) {
                         pos = 0; 
-                } else if (pos > feeder.feed[currentItem]["duration"] - 1) { 
-                        pos = feeder.feed[currentItem]["duration"] - 1; 
+                } else if (pos > feeder.feed[currentItem]["duration"]-1) {
+                        pos = feeder.feed[currentItem]["duration"]-1; 
                 }
                 if (flvType=="RTMP" && feeder.feed[currentItem]["id"] != currentURL) {
@@ -201 +201 @@
         /** Pause the video that's currently playing. **/
         private function setPause(pos:Number) {
-                if(pos < 1) { pos = 0; }
+                if(pos < 1) {
+                        pos = 0; 
+                } else if (pos > feeder.feed[currentItem]["duration"]-1) {
+                        pos = feeder.feed[currentItem]["duration"]-1; 
+                }
                 clearInterval(positionInterval);
                 if(pos != undefined) {

trunk/as2/com/jeroenwijering/players/ImageRotator.as

@@ -10 +10 @@
 
 
-class com.jeroenwijering.players.ImageRotator extends AbstractPlayer { 
+class com.jeroenwijering.players.ImageRotator extends AbstractPlayer {
 
 
@@ -43 +43 @@
                 rotatetime:5,
                 shuffle:"true",
+                usefullscreen:'true',
                 volume:80,
 
@@ -51 +52 @@
                 useaudio:"true",
 
-                abouttxt:"JW Image Rotator 3.16",
+                abouttxt:"JW Image Rotator 3.17",
                 aboutlnk:"http://www.jeroenwijering.com/?about=JW_Image_Rotator"
         };

trunk/as2/com/jeroenwijering/players/JavascriptView.as

@@ -36 +36 @@
                 super(ctr,cfg,fed);
                 if(ExternalInterface.available) {
-                        ExternalInterface.addCallback("sendEvent",this,sendEvent);
+                        try { 
+                                ExternalInterface.addCallback("sendEvent",this,sendEvent);
+                        } catch(err) {}
                 }
         };

trunk/as2/com/jeroenwijering/players/MediaPlayer.as

@@ -22 +22 @@
                 displayheight:undefined,
                 displaywidth:undefined,
-                searchbar:'true',
+                searchbar:'false',
 
                 file:undefined,
@@ -78 +78 @@
                 usekeys:'true',
 
-                abouttxt:'JW Player 3.16',
+                abouttxt:'JW Player 3.17',
                 aboutlnk:'http://www.jeroenwijering.com/?about=JW_FLV_Media_Player'
         };

trunk/as2/com/jeroenwijering/players/PlayerController.as

@@ -53 +53 @@
                 }
                 if(config["autostart"] == "false") {
+                        isPlaying = false;
                         sendChange("pause",feeder.feed[currentItem]['start']);
-                        isPlaying = false;
                 } else {
                         sendChange("start",feeder.feed[currentItem]['start']);

trunk/as2/com/jeroenwijering/players/RotatorController.as

@@ -105 +105 @@
         /** Play a new item. **/
         private function setPlayitem(itm:Number) {
-                if(itm != currentItem) {
-                        sendChange("stop");
-                        itm > feeder.feed.length-1 ? itm = feeder.feed.length-1: null;
-                        currentItem = itm;
-                        sendChange("item",itm);
-                }
+                sendChange("stop");
+                itm > feeder.feed.length-1 ? itm = feeder.feed.length-1: null;
+                currentItem = itm;
+                sendChange("item",itm);
                 if(feeder.feed[itm]["start"] == undefined) {
                         sendChange("start",0);
@@ -132 +130 @@
 
         /** Determine what to do if an item is completed. **/
-        private function setComplete() { 
+        private function setComplete() {
                 itemsPlayed++;
                 if(config["repeat"]=="false" || (config["repeat"] == "list"
-                        && itemsPlayed >= feeder.feed.length)) {
+                        && currentItem == feeder.feed.length-1)) {
                         sendChange("pause",0);
                         isPlaying = false;
@@ -169 +167 @@
 
 
+        /** Fullscreen switch function. **/
+        private function setFullscreen() {
+                if(Stage["displayState"] == "normal" && config["usefullscreen"] == "true") {
+                        Stage["displayState"] = "fullScreen";
+                } else if (Stage["displayState"] == "fullScreen" && 
+                        config["usefullscreen"] == "true") {
+                        Stage["displayState"] = "normal";
+                }
+        };
+
+
         /** Switch active model and send changes. **/
         private function sendChange(typ:String,prm:Number):Void {

trunk/as2/com/jeroenwijering/players/RotatorView.as

@@ -42 +42 @@
                 "slowfade"
         );
+        /** Dimensions of the display **/
+        private var dims:Array;
 
 
@@ -47 +49 @@
         function RotatorView(ctr:AbstractController,cfg:Object,fed:Object) { 
                 super(ctr,cfg,fed);
+                dims = new Array(config['width'],config['height']);
                 setColorsClicks();
                 if(config["shownavigation"] == "true") {
                         Mouse.addListener(this);
+                        Stage.addListener(this);
                 }
         };
@@ -58 +62 @@
                 var ref = this;
                 var tgt:MovieClip = config["clip"];
-                tgt.button._width = config["width"];
-                tgt.button._height = config["height"];
+                tgt.button._width = dims[0];
+                tgt.button._height = dims[1];
                 if(config['overstretch']=='true' || config['overstretch']=='fit') {
                         tgt.img1.bg._visible = tgt.img2.bg._visible = false;
                 } else {
-                        tgt.img1.bg._width = tgt.img2.bg._width = config["width"];
-                        tgt.img1.bg._height = tgt.img2.bg._height = config["height"];
+                        tgt.img1.bg._width = tgt.img2.bg._width = dims[0];
+                        tgt.img1.bg._height = tgt.img2.bg._height = dims[1];
                         tgt.img1.col = new Color(tgt.img1.bg);
                         tgt.img1.col.setRGB(config["screencolor"]);
@@ -86 +90 @@
                 tgt.navigation.swapDepths(6);
                 tgt.logo.swapDepths(7);
-                tgt.playicon._x=tgt.activity._x = Math.round(config["width"]/2);
-                tgt.playicon._y=tgt.activity._y = Math.round(config["height"]/2);
+                tgt.playicon._x=tgt.activity._x = Math.round(dims[0]/2);
+                tgt.playicon._y=tgt.activity._y = Math.round(dims[1]/2);
                 if(config["logo"] != undefined) {
                         var lll = new ImageLoader(tgt.logo,"none");
                         lll.onLoadFinished = function() {
-                                ref.config['clip'].logo._x = ref.config["displaywidth"] -
+                                ref.config['clip'].logo._x = ref.dims[0] -
                                         ref.config['clip'].logo._width -10;
                                 ref.config['clip'].logo._y = 10;
@@ -99 +103 @@
                 tgt = config["clip"].navigation;
                 if (config["shownavigation"] == "true") {
-                        tgt._y = config["height"] - 40;
-                        tgt._x = config["width"]/2 - 50;
+                        tgt._y = dims[1] - 40;
+                        tgt._x = dims[0]/2 - 50;
                         tgt.prevBtn.col1 = new Color(tgt.prevBtn.bck);
                         tgt.prevBtn.col1.setRGB(config["backcolor"]);
@@ -199 +203 @@
                                 tgt.audioBtn._x = 0;
                                 tgt.audioBtn._visible = false;
-                        }       
-                        tgt._x = Math.round(config["width"]/2 - tgt._width/2);
+                        }
+                        
+                        if(Stage["displayState"] == "normal" && config["usefullscreen"] == "true") {
+                                tgt.fullscreenBtn.col1 = new Color(tgt.fullscreenBtn.bck);
+                                tgt.fullscreenBtn.col2 = new Color(tgt.fullscreenBtn.icnOn);
+                                tgt.fullscreenBtn.col3 = new Color(tgt.fullscreenBtn.icnOff);
+                                tgt.fullscreenBtn.col1.setRGB(config["backcolor"]);
+                                tgt.fullscreenBtn.col2.setRGB(config["frontcolor"]);
+                                tgt.fullscreenBtn.col3.setRGB(config["frontcolor"]);
+                                tgt.fullscreenBtn.onRollOver = function() {
+                                        this.col2.setRGB(ref.config["lightcolor"]);
+                                        this.col3.setRGB(ref.config["lightcolor"]);
+                                };
+                                tgt.fullscreenBtn.onRollOut = function() {
+                                        this.col2.setRGB(ref.config["frontcolor"]);
+                                        this.col3.setRGB(ref.config["frontcolor"]);
+                                };
+                                tgt.fullscreenBtn.onRelease = function() {
+                                        ref.sendEvent("fullscreen");
+                                        this.col2.setRGB(ref.config["frontcolor"]);
+                                        this.col3.setRGB(ref.config["frontcolor"]);
+                                };
+                                tgt.fullscreenBtn.icnOff._visible = false;
+                                if(feeder.audio == true) {
+                                        tgt.fullscreenBtn._x = len*6 + 130;
+                                } else {
+                                        tgt.fullscreenBtn._x = len*6 + 104;
+                                }
+                        } else {
+                                tgt.fullscreenBtn._x = 0;
+                                tgt.fullscreenBtn._visible = false;
+                        }
+                        tgt._x = Math.round(dims[0]/2 - tgt._width/2);
                 } else {
                         tgt._visible = false;
@@ -268 +303 @@
                         clp._y = 0;
                 } else if (dir == 2) {
-                        clp._x = config['width'] - upClip._width;
-                } else {
-                        clp._y = config['height'] - upClip._height;
+                        clp._x = dims[0] - upClip._width;
+                } else {
+                        clp._y = dims[1] - upClip._height;
                 }
                 clp.onEnterFrame = function() {
@@ -372 +407 @@
                 config["clip"].attachMovie("blocksMask","mask",3);
                 var msk:MovieClip = config["clip"].mask;
-                if (config["width"] > config["height"]) {
-                        msk._width = msk._height = config["width"];
-                } else {
-                        msk._width = msk._height = config["height"];
+                if (dims[0] > dims[1]) {
+                        msk._width = msk._height = dims[0];
+                } else {
+                        msk._width = msk._height = dims[1];
                 }
                 msk._rotation = random(4)*90;
-                msk._rotation == 90 ? msk._x = config["width"]: null;
-                msk._rotation == 180 ? msk._x = config["width"]: null;
-                msk._rotation == 180 ? msk._y = config["height"]: null;
-                msk._rotation == -90 ? msk._y = config["height"]: null;
+                msk._rotation == 90 ? msk._x = dims[0]: null;
+                msk._rotation == 180 ? msk._x = dims[0]: null;
+                msk._rotation == 180 ? msk._y = dims[1]: null;
+                msk._rotation == -90 ? msk._y = dims[1]: null;
                 upClip.setMask(msk);
                 playClip(msk);
@@ -393 +428 @@
                 var msk:MovieClip = config["clip"].mask;
                 upClip.setMask(msk);
-                if (config["width"] > config["height"]) {
-                        msk._width = msk._height = config["width"];
-                        msk._y = config["height"]/2 - msk._height/2;
-                } else {
-                        msk._width = msk._height = config["height"];
-                        msk._x = config["width"]/2- msk._width/2;
+                if (dims[0] > dims[1]) {
+                        msk._width = msk._height = dims[0];
+                        msk._y = dims[1]/2 - msk._height/2;
+                } else {
+                        msk._width = msk._height = dims[1];
+                        msk._x = dims[0]/2- msk._width/2;
                 }
                 if(random(2) == 1) { 
                         msk._xscale = -msk._xscale; 
-                        msk._x += config['width']; 
+                        msk._x += dims[0]; 
                 }
                 playClip(msk);
@@ -414 +449 @@
                 var msk:MovieClip = config["clip"].mask;
                 upClip.setMask(msk);
-                if (config["width"] > config["height"]) {
-                        msk._width = msk._height = config["width"];
-                } else {
-                        msk._width = msk._height = config["height"];
-                }
-                msk._x = config["width"]/2;
-                msk._y = config["height"]/2;
+                if (dims[0] > dims[1]) {
+                        msk._width = msk._height = dims[0];
+                } else {
+                        msk._width = msk._height = dims[1];
+                }
+                msk._x = dims[0]/2;
+                msk._y = dims[1]/2;
                 playClip(msk,10);
         };
@@ -451 +486 @@
                 var msk:MovieClip = config["clip"].mask;
                 upClip.setMask(msk);
-                msk._width = config["width"];
-                msk._height = config["height"];
+                msk._width = dims[0];
+                msk._height = dims[1];
                 playClip(msk);
         };
@@ -463 +498 @@
                 var msk:MovieClip = config["clip"].mask;
                 upClip.setMask(msk);
-                msk._width = config["width"];
-                msk._height = config["height"];
+                msk._width = dims[0];
+                msk._height = dims[1];
                 playClip(msk);
         };
@@ -516 +551 @@
 
 
+        /** Catches fullscreen escape  **/
+        public function onFullScreen(fs:Boolean) {
+                if(fs == false) {
+                        dims = new Array(config['width'],config['height']);
+                } else {
+                        dims = new Array(Stage.width,Stage.height);
+                }
+                config["clip"].navigation.fullscreenBtn.icnOn._visible = !fs;
+                config["clip"].navigation.fullscreenBtn.icnOff._visible = fs;
+                setDimensions();
+                sendEvent('playitem',currentItem);
+        };
+
+        /** Resize after a fullscreen enter/leave **/
+        private function setDimensions() {
+                var tgt:MovieClip = config["clip"];
+                tgt.button._width = tgt.img1.bg._width = tgt.img2.bg._width = dims[0];
+                tgt.button._height = tgt.img1.bg._height = tgt.img2.bg._height = dims[1];
+                tgt.playicon._x = tgt.activity._x = Math.round(dims[0]/2);
+                tgt.playicon._y = tgt.activity._y = Math.round(dims[1]/2);
+                tgt.logo._x = dims[0] - tgt.logo._width -10;
+                if (config["shownavigation"] == "true") {
+                        tgt.navigation._y = dims[1] - 40;
+                        tgt.navigation._x = Math.round(dims[0]/2-tgt.navigation._width/2);
+                }
+        };
+
+
 }

trunk/as2/com/jeroenwijering/utils/ImageLoader.as

@@ -77 +77 @@
         /** Scale the image while maintaining aspectratio **/
         private function scaleImage(tgt:MovieClip):Void {
+                if(Stage["displayState"] == "fullScreen") {
+                        var tgw = Stage.width;
+                        var tgh = Stage.height;
+                } else { 
+                        var tgw = targetWidth;
+                        var tgh = targetHeight;
+                }
                 targetClip._xscale = targetClip._yscale = 100;
                 var tcf = tgt._currentframe;
@@ -83 +90 @@
                 sourceHeight = tgt._height;
                 sourceLength = tgt._totalframes/20;
-                var xsr = targetWidth/sourceWidth;
-                var ysr = targetHeight/sourceHeight;
+                var xsr = tgw/sourceWidth;
+                var ysr = tgh/sourceHeight;
                 if (overStretch == "fit" || Math.abs(xsr-ysr) < 0.1) {
-                        tgt._width = targetWidth;
-                        tgt._height = targetHeight;
+                        tgt._width = tgw;
+                        tgt._height = tgh;
                 } else if ((overStretch == "true" && xsr > ysr) || 
                         (overStretch == "false" && xsr < ysr)) { 
@@ -97 +104 @@
                 }
                 if(targetWidth != undefined) {
-                        tgt._x = targetWidth/2 - tgt._width/2;
-                        tgt._y = targetHeight/2 - tgt._height/2;
+                        tgt._x = tgw/2 - tgt._width/2;
+                        tgt._y = tgh/2 - tgt._height/2;
                 }
                 tgt.gotoAndPlay(tcf);

trunk/as3/com/jeroenwijering/events/AbstractView.as

@@ -23 +23 @@
 
         /**  Subscribers to the controller and model. **/
-        public function addControllerListener(typ:String,fcn:Function) {};
-        public function addModelListener(typ:String,fcn:Function) {};
-        public function addViewListener(typ:String,fcn:Function) {};
+        public function addControllerListener(typ:String,fcn:Function):void {};
+        public function addModelListener(typ:String,fcn:Function):void {};
+        public function addViewListener(typ:String,fcn:Function):void {};
 
 
         /**  Dispatch events. **/
-        public function sendEvent(typ:String,prm:Object=undefined) { };
+        public function sendEvent(typ:String,prm:Object=undefined):void { };
 
 

trunk/as3/com/jeroenwijering/events/ControllerEvent.as

@@ -32 +32 @@
         * @param dat    An object with all associated data.
         **/
-        public function ControllerEvent(typ:String,dat:Object=undefined,bbl:Boolean=false,ccb:Boolean=false) {
+        public function ControllerEvent(typ:String,dat:Object=undefined,bbl:Boolean=false,ccb:Boolean=false):void {
                 super(typ,bbl,ccb);
                 _data = dat;

trunk/as3/com/jeroenwijering/events/ModelEvent.as

@@ -28 +28 @@
         * @param dat    An object with all associated data.
         **/
-        public function ModelEvent(typ:String,dat:Object=undefined,bbl:Boolean=false,ccb:Boolean=false) {
+        public function ModelEvent(typ:String,dat:Object=undefined,bbl:Boolean=false,ccb:Boolean=false):void {
                 super(typ,bbl,ccb);
                 _data = dat;

trunk/as3/com/jeroenwijering/events/PluginInterface.as

@@ -11 +11 @@
 
 
-        function initializePlugin(vie:AbstractView);
+        function initializePlugin(vie:AbstractView):void;
 
 

trunk/as3/com/jeroenwijering/events/ViewEvent.as

@@ -36 +36 @@
         * @param dat    An object with all associated data.
         **/
-        public function ViewEvent(typ:String,dat:Object=undefined,bbl:Boolean=false,ccb:Boolean=false) {
+        public function ViewEvent(typ:String,dat:Object=undefined,bbl:Boolean=false,ccb:Boolean=false):void {
                 super(typ, bbl, ccb);
                 _data = dat;

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

@@ -36 +36 @@
 
 
-        public function CameraModel(mod:Model) {
+        public function CameraModel(mod:Model):void {
                 model = mod;
                 try {
@@ -54 +54 @@
 
         /** Catch security errors. **/
-        private function errorHandler(evt:ErrorEvent) {
+        private function errorHandler(evt:ErrorEvent):void {
                 model.sendEvent(ModelEvent.ERROR,{message:evt.text});
         };
@@ -61 +61 @@
 
         /** Load the camera into the video **/
-        public function load() {
+        public function load():void {
                 position = model.playlist[model.config['item']]['start'];
                 model.mediaHandler(video);
@@ -73 +73 @@
 
         /** Pause playback. **/
-        public function pause() {
+        public function pause():void {
                 video.attachCamera(null);
                 if(stream) { 
@@ -86 +86 @@
 
         /** Resume playback **/
-        public function play() {
+        public function play():void {
                 video.attachCamera(camera);
                 model.sendEvent(ModelEvent.STATE,{newstate:ModelStates.PLAYING});
@@ -99 +99 @@
 
         /** Change the quality mode. **/
-        public function quality(stt:Boolean) {
+        public function quality(stt:Boolean):void {
                 if(stt == true) {
                         camera.setMode(480,360,25);
@@ -115 +115 @@
 
         /** Seek the camera timeline. **/
-        public function seek(pos:Number) {
+        public function seek(pos:Number):void {
                 position = pos;
                 clearInterval(interval);
@@ -123 +123 @@
 
         /** Destroy the videocamera. **/
-        public function stop() {
+        public function stop():void {
                 position = 0;
                 video.attachCamera(null);
@@ -132 +132 @@
 
         /** Receive NetStream status updates. **/
-        private function statusHandler(evt:NetStatusEvent) {
+        private function statusHandler(evt:NetStatusEvent):void {
                 if(evt.info.code == "NetConnection.Connect.Success") {
                         stream = new NetStream(connection);
@@ -143 +143 @@
 
         /** Interval function that countdowns the time. **/
-        private function timeInterval() {
+        private function timeInterval():void {
                 position = Math.round(position*10+1)/10;
                 var dur = model.playlist[model.config['item']]['duration'];
@@ -158 +158 @@
 
         /** Volume setting **/
-        public function volume(pct:Number) {};
+        public function volume(pct:Number):void {};
 
 

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

@@ -48 +48 @@
 
         /** Constructor; sets up the connection and display. **/
-        public function HTTPModel(mod:Model) {
+        public function HTTPModel(mod:Model):void {
                 model = mod;
                 connection = new NetConnection();
@@ -72 +72 @@
 
         /** Catch security errors. **/
-        private function errorHandler(evt:ErrorEvent) {
+        private function errorHandler(evt:ErrorEvent):void {
                 model.sendEvent(ModelEvent.ERROR,{message:evt.text});
         };
@@ -99 +99 @@
 
         /** Load content. **/
-        public function load() {
+        public function load():void {
                 if(stream.bytesLoaded != stream.bytesTotal) {
                         stream.close();
@@ -132 +132 @@
 
         /** Interval for the loading progress **/
-        private function loadHandler() {
+        private function loadHandler():void {
                 loaded = stream.bytesLoaded;
                 var ttl = stream.bytesTotal;
@@ -143 +143 @@
 
         /** Catch noncritical errors. **/
-        private function metaHandler(evt:ErrorEvent) {
+        private function metaHandler(evt:ErrorEvent):void {
                 model.sendEvent(ModelEvent.META,{error:evt.text});
         };
@@ -149 +149 @@
 
         /** Get metadata information from netstream class. **/
-        public function onData(dat:Object) {
+        public function onData(dat:Object):void {
                 if(dat.type == 'metadata' && !h264) {
                         if(dat.width) {
@@ -181 +181 @@
 
         /** Pause playback. **/
-        public function pause() {
+        public function pause():void {
                 clearInterval(timeinterval);
                 stream.pause();
@@ -189 +189 @@
 
         /** Resume playing. **/
-        public function play() {
+        public function play():void {
                 stream.resume();
                 timeinterval = setInterval(timeHandler,100);
@@ -197 +197 @@
 
         /** Change the smoothing mode. **/
-        public function seek(pos:Number) {
+        public function seek(pos:Number):void {
                 clearInterval(timeinterval);
                 var off = getOffset(pos);
@@ -216 +216 @@
 
         /** Change the smoothing mode. **/
-        public function quality(qua:Boolean) {
+        public function quality(qua:Boolean):void {
                 if(qua == true) { 
                         video.smoothing = true;
@@ -228 +228 @@
 
         /** Receive NetStream status updates. **/
-        private function statusHandler(evt:NetStatusEvent) {
+        private function statusHandler(evt:NetStatusEvent):void {
                 if(evt.info.code == "NetStream.Play.Stop") {
                         if(model.config['state'] != ModelStates.COMPLETED) { 
@@ -245 +245 @@
 
         /** Destroy the HTTP stream. **/
-        public function stop() {
+        public function stop():void {
                 clearInterval(loadinterval);
                 clearInterval(timeinterval);
@@ -259 +259 @@
 
         /** Interval for the position progress **/
-        private function timeHandler() {
+        private function timeHandler():void {
                 var bfr = Math.round(stream.bufferLength/stream.bufferTime*100);
                 var pos = Math.round(stream.time*10)/10;
@@ -284 +284 @@
 
         /** Set the volume level. **/
-        public function volume(vol:Number) {
+        public function volume(vol:Number):void {
                 transform.volume = vol/100;
                 stream.soundTransform = transform;

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

@@ -31 +31 @@
 
         /** Constructor; sets up listeners **/
-        public function ImageModel(mod:Model) {
+        public function ImageModel(mod:Model):void {
                 model = mod;
                 loader = new Loader();
@@ -41 +41 @@
 
         /** load image into screen **/
-        public function load() {
+        public function load():void {
                 clearInterval(interval);
                 position = model.playlist[model.config['item']]['start'];
@@ -51 +51 @@
 
         /** Catch errors. **/
-        private function errorHandler(evt:ErrorEvent) {
+        private function errorHandler(evt:ErrorEvent):void {
                 model.sendEvent(ModelEvent.ERROR,{message:evt.text});
         };
@@ -57 +57 @@
 
         /** Load and place the image on stage. **/
-        private function loaderHandler(evt:Event) {
+        private function loaderHandler(evt:Event):void {
                 model.mediaHandler(loader);
                 quality(model.config['quality']);
@@ -67 +67 @@
 
         /** Resume playback of the images **/
-        public function play() {
+        public function play():void {
                 interval = setInterval(timeInterval,100);
                 model.sendEvent(ModelEvent.STATE,{newstate:ModelStates.PLAYING});
@@ -74 +74 @@
 
         /** Show or hide the camera. **/
-        public function pause() {
+        public function pause():void {
                 clearInterval(interval);
                 model.sendEvent(ModelEvent.STATE,{newstate:ModelStates.PAUSED});
@@ -81 +81 @@
 
         /** Send load progress to player. **/
-        private function progressHandler(evt:ProgressEvent) {
+        private function progressHandler(evt:ProgressEvent):void {
                 var pct = Math.round(evt.bytesLoaded/evt.bytesTotal*100);
                 model.sendEvent(ModelEvent.BUFFER,{percentage:pct});
@@ -88 +88 @@
 
         /** Change the quality mode. **/
-        public function quality(stt:Boolean) {
+        public function quality(stt:Boolean):void {
                 try {
                         Bitmap(loader.content).smoothing = stt;
@@ -96 +96 @@
 
         /** Scrub the image to a certain position. **/
-        public function seek(pos:Number) {
+        public function seek(pos:Number):void {
                 clearInterval(interval);
                 position = pos;
@@ -104 +104 @@
 
         /** Stop the image interval. **/
-        public function stop() {
+        public function stop():void {
                 flash.media.SoundMixer.stopAll();
                 clearInterval(interval);
@@ -116 +116 @@
 
         /** Interval function that countdowns the time. **/
-        private function timeInterval() {
+        private function timeInterval():void {
                 position = Math.round(position*10+1)/10;
                 var dur = model.playlist[model.config['item']]['duration'];
@@ -130 +130 @@
 
         /** Volume setting **/
-        public function volume(pct:Number) { };
+        public function volume(pct:Number):void { };
 
 

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

@@ -11 +11 @@
 
         /** Load a file into the model. **/
-        function load();
+        function load():void;
         /** Playback resume directive. **/
-        function play();
+        function play():void;
         /** Playback pause directive. **/
-        function pause();
+        function pause():void;
         /** Playback seeking directive. **/
-        function seek(pos:Number);
+        function seek(pos:Number):void;
         /** Stop the item altogether. **/
-        function stop();
+        function stop():void;
         /** Set or toggle the playback quality. **/
-        function quality(stt:Boolean);
+        function quality(stt:Boolean):void;
         /** Change the volume. **/
-        function volume(vol:Number);
+        function volume(vol:Number):void;
 
 

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

@@ -39 +39 @@
 
         /** Constructor; sets up the connection and display. **/
-        public function RTMPModel(mod:Model) {
+        public function RTMPModel(mod:Model):void {
                 model = mod;
                 connection = new NetConnection();
@@ -56 +56 @@
 
         /** Catch security errors. **/
-        private function errorHandler(evt:ErrorEvent) {
+        private function errorHandler(evt:ErrorEvent):void {
                 model.sendEvent(ModelEvent.ERROR,{message:evt.text});
         };
@@ -76 +76 @@
 
         /** Load content. **/
-        public function load() {
+        public function load():void {
                 connection.connect(model.config['streamer']);
                 model.sendEvent(ModelEvent.STATE,{newstate:ModelStates.BUFFERING});
@@ -83 +83 @@
 
         /** Catch noncritical errors. **/
-        private function metaHandler(evt:ErrorEvent) {
+        private function metaHandler(evt:ErrorEvent):void {
                 model.sendEvent(ModelEvent.META,{error:evt.text});
         };
@@ -89 +89 @@
 
         /** Get metadata information from netstream class. **/
-        public function onData(dat:Object) {
+        public function onData(dat:Object):void {
                 if(dat.type == 'metadata' && !metadata) {
                         metadata = true;
@@ -114 +114 @@
 
         /** Pause playback. **/
-        public function pause() {
+        public function pause():void {
                 clearInterval(timeinterval);
                 stream.pause();
@@ -122 +122 @@
 
         /** Resume playing. **/
-        public function play() {
+        public function play():void {
                 clearTimeout(timeout);
                 clearInterval(timeinterval);
@@ -132 +132 @@
 
         /** Change the smoothing mode. **/
-        public function quality(qua:Boolean) {
+        public function quality(qua:Boolean):void {
                 if(qua == true) { 
                         video.smoothing = true;
@@ -144 +144 @@
 
         /** Change the smoothing mode. **/
-        public function seek(pos:Number) {
+        public function seek(pos:Number):void {
                 clearTimeout(timeout);
                 clearInterval(timeinterval);
@@ -157 +157 @@
 
         /** Set streaming object **/
-        public function setStream() {
+        public function setStream():void {
                 var url = getID(model.playlist[model.config['item']]['file']);
                 stream = new NetStream(connection);
@@ -174 +174 @@
 
         /** Receive NetStream status updates. **/
-        private function statusHandler(evt:NetStatusEvent) {
+        private function statusHandler(evt:NetStatusEvent):void {
                 if(evt.info.code == "NetConnection.Connect.Success") {
                         if (evt.info.secureToken != undefined) {
@@ -199 +199 @@
 
         /** Destroy the stream. **/
-        public function stop() {
+        public function stop():void {
                 metadata = false;
                 clearInterval(timeinterval);
@@ -209 +209 @@
 
         /** Akamai & Limelight subscribes. **/
-        private function subscribe(nme:String) {
+        private function subscribe(nme:String):void {
                 connection.call("FCSubscribe",null,nme);
         };
@@ -215 +215 @@
 
         /** Interval for the position progress **/
-        private function timeHandler() {
+        private function timeHandler():void {
                 var bfr = Math.round(stream.bufferLength/stream.bufferTime*100);
                 var pos = Math.round(stream.time*10)/10;
@@ -239 +239 @@
 
         /** Set the volume level. **/
-        public function volume(vol:Number) {
+        public function volume(vol:Number):void {
                 transform.volume = vol/100;
                 if(stream) { 

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

@@ -37 +37 @@
 
         /** Constructor; sets up the connection and display. **/
-        public function SoundModel(mod:Model) {
+        public function SoundModel(mod:Model):void {
                 model = mod;
                 transform = new SoundTransform();
@@ -46 +46 @@
 
         /** Sound completed; send event. **/
-        private function completeHandler(evt:Event) {
+        private function completeHandler(evt:Event):void {
                 clearInterval(interval);
                 position = model.playlist[model.config['item']]['start'];
@@ -55 +55 @@
 
         /** Catch errors. **/
-        private function errorHandler(evt:ErrorEvent) {
+        private function errorHandler(evt:ErrorEvent):void {
                 model.sendEvent(ModelEvent.ERROR,{message:evt.text});
                 stop();
@@ -62 +62 @@
 
         /** Load the sound. **/
-        public function load() {
+        public function load():void {
                 position = model.playlist[model.config['item']]['start'];
                 duration = model.playlist[model.config['item']]['duration'];
@@ -75 +75 @@
 
         /** Pause the sound. **/
-        public function pause() {
+        public function pause():void {
                 clearInterval(interval);
                 channel.stop();
@@ -83 +83 @@
 
         /** Play the sound. **/
-        public function play() {
+        public function play():void {
                 channel = sound.play(position*1000,0,transform);
                 channel.removeEventListener(Event.SOUND_COMPLETE,completeHandler);
@@ -93 +93 @@
 
         /** Interval for the loading progress **/
-        private function progressHandler(evt:ProgressEvent) {
+        private function progressHandler(evt:ProgressEvent):void {
                 var ldd = evt.bytesLoaded;
                 var ttl = evt.bytesTotal;
@@ -101 +101 @@
 
         /** Change quality setting. **/
-        public function quality(typ:Boolean) {};
+        public function quality(typ:Boolean):void {};
 
 
         /** Seek in the sound. **/
-        public function seek(pos:Number) {
+        public function seek(pos:Number):void {
                 clearInterval(interval);
                 position = pos;
@@ -114 +114 @@
 
         /** Destroy the sound. **/
-        public function stop() {
+        public function stop():void {
                 clearInterval(interval);
                 if(channel) { channel.stop(); }
@@ -124 +124 @@
 
         /** Interval for the position progress **/
-        private function timeHandler() {
+        private function timeHandler():void {
                 position = Math.round(channel.position/100)/10;
                 var dur = Math.round(sound.length*sound.bytesTotal/sound.bytesLoaded/100)/10;
@@ -148 +148 @@
 
         /** Set the volume level. **/
-        public function volume(vol:Number) {
+        public function volume(vol:Number):void {
                 transform.volume = vol/100;
                 if(channel) {

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

@@ -40 +40 @@
 
         /** Constructor; sets up the connection and display. **/
-        public function VideoModel(mod:Model) {
+        public function VideoModel(mod:Model):void {
                 model = mod;
                 connection = new NetConnection();
@@ -63 +63 @@
 
         /** Catch security errors. **/
-        private function errorHandler(evt:ErrorEvent) {
+        private function errorHandler(evt:ErrorEvent):void {
                 model.sendEvent(ModelEvent.ERROR,{message:evt.text});
         };
@@ -69 +69 @@
 
         /** Load content. **/
-        public function load() {
+        public function load():void {
                 stream.play(model.playlist[model.config['item']]['file']);
                 loadinterval = setInterval(loadHandler,100);
@@ -78 +78 @@
 
         /** Interval for the loading progress **/
-        private function loadHandler() { 
+        private function loadHandler():void { 
                 var ldd = stream.bytesLoaded;
                 var ttl = stream.bytesTotal;
@@ -89 +89 @@
 
         /** Catch noncritical errors. **/
-        private function metaHandler(evt:ErrorEvent) {
+        private function metaHandler(evt:ErrorEvent):void {
                 model.sendEvent(ModelEvent.META,{error:evt.text});
         };
@@ -95 +95 @@
 
         /** Get metadata information from netstream class. **/
-        public function onData(dat:Object) {
+        public function onData(dat:Object):void {
                 if(dat.type == 'metadata' && !metadata) {
                         metadata = true;
@@ -114 +114 @@
 
         /** Pause playback. **/
-        public function pause() {
+        public function pause():void {
                 clearInterval(timeinterval);
                 stream.pause();
@@ -122 +122 @@
 
         /** Resume playing. **/
-        public function play() {
+        public function play():void {
                 stream.resume();
                 timeinterval = setInterval(timeHandler,100);
@@ -130 +130 @@
 
         /** Change the smoothing mode. **/
-        public function quality(qua:Boolean) {
+        public function quality(qua:Boolean):void {
                 if(qua == true) { 
                         video.smoothing = true;
@@ -142 +142 @@
 
         /** Change the smoothing mode. **/
-        public function seek(pos:Number) {
+        public function seek(pos:Number):void {
                 clearInterval(timeinterval);
                 stream.seek(pos);
@@ -150 +150 @@
 
         /** Receive NetStream status updates. **/
-        private function statusHandler(evt:NetStatusEvent) {
+        private function statusHandler(evt:NetStatusEvent):void {
                 if(evt.info.code == "NetStream.Play.Stop" && stream.bytesLoaded == stream.bytesTotal) {
                         clearInterval(timeinterval);
@@ -163 +163 @@
 
         /** Destroy the video. **/
-        public function stop() {
+        public function stop():void {
                 if(stream.bytesLoaded != stream.bytesTotal) {
                         stream.close();
@@ -175 +175 @@
 
         /** Interval for the position progress **/
-        private function timeHandler() {
+        private function timeHandler():void {
                 var bfr = Math.round(stream.bufferLength/stream.bufferTime*100);
                 var pos = Math.round(stream.time*10)/10;
@@ -199 +199 @@
 
         /** Set the volume level. **/
-        public function volume(vol:Number) {
+        public function volume(vol:Number):void {
                 transform.volume = vol/100;
                 stream.soundTransform = transform;

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

@@ -38 +38 @@
 
         /** Setup YouTube connections and load proxy. **/
-        public function YoutubeModel(mod:Model) {
+        public function YoutubeModel(mod:Model):void {
                 model = mod;
                 outgoing = new LocalConnection();
@@ -65 +65 @@
 
         /** Catch load errors. **/
-        private function errorHandler(evt:ErrorEvent) {
+        private function errorHandler(evt:ErrorEvent):void {
                 model.sendEvent(ModelEvent.ERROR,{message:evt.text});
         };
@@ -85 +85 @@
 
         /** Load the YouTube movie. **/
-        public function load() {
+        public function load():void {
                 if(connected) {
                         model.sendEvent(ModelEvent.STATE,{newstate:ModelStates.BUFFERING});
@@ -100 +100 @@
 
         /** Pause the YouTube movie. **/
-        public function pause() {
+        public function pause():void {
                 outgoing.send("_AS3_to_AS2","pauseVideo");
         };
@@ -107 +107 @@
 
         /** Play or pause the video. **/
-        public function play() {
+        public function play():void {
                 outgoing.send("_AS3_to_AS2","playVideo");
         };
@@ -113 +113 @@
 
         /** SWF loaded; add it to the tree **/
-        public function onSwfLoadComplete() {
+        public function onSwfLoadComplete():void {
                 outgoing.send("_AS3_to_AS2","setSize",320,240);
                 model.config['mute'] == true ? volume(0): volume(model.config['volume']);
@@ -121 +121 @@
 
         /** error was thrown without this handler **/
-        public function onLocalConnectionStatusChange(evt:StatusEvent) {
+        public function onLocalConnectionStatusChange(evt:StatusEvent):void {
                 // model.sendEvent(ModelEvent.META,{status:evt.code});
         };
@@ -127 +127 @@
 
         /** Catch youtube errors. **/
-        public function onError(erc:String) {
+        public function onError(erc:String):void {
                 var fil = model.playlist[model.config['item']]['file'];
                 model.sendEvent(ModelEvent.ERROR,{message:"YouTube error (video not found?):\n"+fil});
@@ -135 +135 @@
 
         /** Catch youtube state changes. **/
-        public function onStateChange(stt:Number) {
+        public function onStateChange(stt:Number):void {
                 switch(Number(stt)) {
                         case -1:
@@ -160 +160 @@
 
         /** Catch Youtube load changes **/
-        public function onLoadChange(ldd:Number,ttl:Number,off:Number) {
+        public function onLoadChange(ldd:Number,ttl:Number,off:Number):void {
                 model.sendEvent(ModelEvent.LOADED,{loaded:ldd,total:ttl,offset:off});
         };
@@ -166 +166 @@
 
         /** Catch Youtube position changes **/
-        public function onTimeChange(pos:Number,dur:Number) {
+        public function onTimeChange(pos:Number,dur:Number):void {
                 model.sendEvent(ModelEvent.TIME,{position:pos,duration:dur});
                 if(!metasent) {
@@ -176 +176 @@
 
         /** Toggle quality (perhaps access the H264 versions later?). **/
-        public function quality(stt:Boolean) {};
+        public function quality(stt:Boolean):void {};
 
 
         /** Seek to position. **/
-        public function seek(pos:Number) {
+        public function seek(pos:Number):void {
                 outgoing.send("_AS3_to_AS2","seekTo",pos);
                 play();
@@ -187 +187 @@
 
         /** Destroy the youtube video. **/
-        public function stop() {
+        public function stop():void {
                 outgoing.send("_AS3_to_AS2","stopVideo");
         };
@@ -194 +194 @@
 
         /** Set the volume level. **/
-        public function volume(pct:Number) {
+        public function volume(pct:Number):void {
                 outgoing.send("_AS3_to_AS2","setVolume",pct);
         };

trunk/as3/com/jeroenwijering/parsers/SMILParser.as

@@ -90 +90 @@
 
         /** Get attributes from a SMIL element. **/
-        public static function parseAttributes(obj:Object,itm:Object) {
+        public static function parseAttributes(obj:Object,itm:Object):Object {
                 for(var i=0; i<obj.attributes().length(); i++) {
                         var att = String(obj.attributes()[i].name());

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

@@ -33 +33 @@
 
         /** Constructor, set up stage and playlist listeners. **/
-        public function Controller(cfg:Object,skn:MovieClip) {
+        public function Controller(cfg:Object,skn:MovieClip):void {
                 config = cfg;
                 skin = skn;
@@ -47 +47 @@
 
         /** Register view and model with controller, start loading playlist. **/
-        public function start(mdl:Model,vie:View) {
+        public function start(mdl:Model,vie:View):void {
                 model= mdl;
                 model.addEventListener(ModelEvent.META,metaHandler);
@@ -78 +78 @@
 
         /** Catch errors dispatched by the playlister. **/
-        private function errorHandler(evt:ErrorEvent) {
+        private function errorHandler(evt:ErrorEvent):void {
                 dispatchEvent(new ControllerEvent(ControllerEvent.ERROR,{message:evt.text}));
         };
@@ -84 +84 @@
 
         /** Switch fullscreen state. **/
-        private function fullscreenHandler(evt:ViewEvent) {
+        private function fullscreenHandler(evt:ViewEvent):void {
                 if(skin.stage['displayState'] == 'fullScreen') {
                         skin.stage['displayState'] = 'normal';
@@ -95 +95 @@
 
         /** Set the fullscreen rectangle **/
-        private function fullscreenrect() {
+        private function fullscreenrect():void {
                 try { 
                         skin.stage["fullScreenSourceRect"] = new Rectangle(0,0,
@@ -104 +104 @@
 
         /** Jump to a userdefined item in the playlist. **/
-        private function itemHandler(evt:ViewEvent) {
+        private function itemHandler(evt:ViewEvent):void {
                 var itm = evt.data.index;
                 if (itm < 0) {
@@ -117 +117 @@
 
         /** Jump to the link of a playlistitem. **/
-        private function linkHandler(evt:ViewEvent) {
+        private function linkHandler(evt:ViewEvent):void {
                 var itm = evt.data.index;
                 if (itm  == undefined) {
@@ -130 +130 @@
 
         /** Load a new playlist. **/
-        private function loadHandler(evt:ViewEvent) {
+        private function loadHandler(evt:ViewEvent):void {
                 stopHandler();
                 try {
@@ -142 +142 @@
 
         /** Update playlist item duration. **/
-        private function metaHandler(evt:ModelEvent) {
+        private function metaHandler(evt:ModelEvent):void {
                 if(evt.data.duration) {
                         var dur = Math.round(evt.data.duration*10)/10
@@ -151 +151 @@
 
         /** Save new state of the mute switch and send volume. **/
-        private function muteHandler(evt:ViewEvent) {
+        private function muteHandler(evt:ViewEvent):void {
                 if(evt.data.state) {
                         if(evt.data.state == config['mute']) {
@@ -166 +166 @@
 
         /** Jump to the next item in the playlist. **/
-        private function nextHandler(evt:ViewEvent) {
+        private function nextHandler(evt:ViewEvent):void {
                 if(playlist && config['shuffle'] == true) { 
                         playItem(randomizer.pick());
@@ -178 +178 @@
 
         /** Change the playback state. **/
-        private function playHandler(evt:ViewEvent) {
+        private function playHandler(evt:ViewEvent):void {
                 if(playlist) {
                         if(evt.data.state != false && config['state'] == ModelStates.PAUSED) {
@@ -195 +195 @@
 
         /** Direct the model to play a new item. **/
-        private function playItem(nbr:Number=undefined) {
+        private function playItem(nbr:Number=undefined):void {
                 if(nbr > -1) {
                         if(playlist[nbr]['file'] == playlist[config['item']]['file']) {
@@ -207 +207 @@
 
         /** Manage loading of a new playlist. **/
-        private function playlistHandler(evt:Event) {
+        private function playlistHandler(evt:Event):void {
                 if(config['shuffle'] == true) {
                         randomizer = new Randomizer(playlist.length);
@@ -222 +222 @@
 
         /** Jump to the previous item in the playlist. **/
-        private function prevHandler(evt:ViewEvent) {
+        private function prevHandler(evt:ViewEvent):void {
                 if (config['item'] == 0) {
                         playItem(playlist.length-1);
@@ -232 +232 @@
 
         /** Switch playback quality. **/
-        private function qualityHandler(evt:ViewEvent=null) {
+        private function qualityHandler(evt:ViewEvent=null):void {
                 if(evt.data.state != undefined) {
                         if(evt.data.state == config['quality']) {
@@ -248 +248 @@
 
         /** Forward a resizing of the stage. **/
-        private function resizeHandler(evt:ViewEvent) {
+        private function resizeHandler(evt:ViewEvent):void {
                 var mgn = config['margins'].split(',');
                 var dat = {
@@ -277 +277 @@
 
         /** Seek to a specific part in a mediafile. **/
-        private function seekHandler(evt:ViewEvent) {
+        private function seekHandler(evt:ViewEvent):void {
                 if(config['state'] != ModelStates.IDLE && playlist[config['item']]['duration'] > 0) {
                         var pos = evt.data.position;
@@ -291 +291 @@
 
         /** Stop all playback and buffering. **/
-        private function stopHandler(evt:ViewEvent=undefined) {
+        private function stopHandler(evt:ViewEvent=undefined):void {
                 dispatchEvent(new ControllerEvent(ControllerEvent.STOP));
         };
@@ -297 +297 @@
 
         /** Manage playback state changes. **/
-        private function stateHandler(evt:ModelEvent) {
+        private function stateHandler(evt:ModelEvent):void {
                 if(evt.data.newstate == ModelStates.COMPLETED && (config['repeat'] == 'always' ||
                         (config['repeat'] == 'list' && config['shuffle'] == true && randomizer.length > 0) || 
@@ -313 +313 @@
 
         /** Save new state of the mute switch and send volume. **/
-        private function volumeHandler(evt:ViewEvent) {
+        private function volumeHandler(evt:ViewEvent):void {
                 var vol = evt.data.percentage;
                 if (vol < 1) {

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

@@ -36 +36 @@
 
         /** Constructor, save arrays and set currentItem. **/
-        public function Model(cfg:Object,skn:MovieClip,ctr:Controller) {
+        public function Model(cfg:Object,skn:MovieClip,ctr:Controller):void {
                 config = cfg;
                 skin = skn;
@@ -57 +57 @@
 
         /** Item change: switch the curently active model if there's a new URL **/
-        private function itemHandler(evt:ControllerEvent) {
+        private function itemHandler(evt:ControllerEvent):void {
                 var typ = playlist[evt.data.index]['type'];
                 var url = playlist[evt.data.index]['file'];
@@ -83 +83 @@
 
         /** Setup a new model. **/
-        private function loadModel(typ:String) {
+        private function loadModel(typ:String):void {
                 switch(typ) {
                         case 'camera':
@@ -117 +117 @@
 
         /** Place a loaded mediafile on stage **/
-        public function mediaHandler(chd:DisplayObject=undefined) {
+        public function mediaHandler(chd:DisplayObject=undefined):void {
                 var obj = skin.display.media;
                 Draw.clear(obj);
@@ -130 +130 @@
 
         /** Load the configuration array. **/
-        private function muteHandler(evt:ControllerEvent) {
+        private function muteHandler(evt:ControllerEvent):void {
                 if(currentModel && evt.data.state == true) {
                         models[currentModel].volume(0); 
@@ -140 +140 @@
 
         /** Togge the playback state. **/
-        private function playHandler(evt:ControllerEvent) {
+        private function playHandler(evt:ControllerEvent):void {
                 if(currentModel) {
                         if(evt.data.state == true) {
@@ -152 +152 @@
 
         /** Send an idle with new playlist. **/
-        private function playlistHandler(evt:ControllerEvent) {
+        private function playlistHandler(evt:ControllerEvent):void {
                 if(currentModel) { 
                         stopHandler(); 
@@ -163 +163 @@
 
         /** Toggle the playback quality. **/
-        private function qualityHandler(evt:ControllerEvent) {
+        private function qualityHandler(evt:ControllerEvent):void {
                 if(currentModel) {
                         models[currentModel].quality(evt.data.state);
@@ -171 +171 @@
 
         /** Resize the media and thumb. **/
-        private function resizeHandler(evt:ControllerEvent) {
+        private function resizeHandler(evt:ControllerEvent):void {
                 Stretcher.stretch(skin.display.media,evt.data.width,evt.data.height,config['stretching']);
         };
@@ -177 +177 @@
 
         /** Seek inside a file. **/
-        private function seekHandler(evt:ControllerEvent) {
+        private function seekHandler(evt:ControllerEvent):void {
                 if(currentModel) {
                         models[currentModel].seek(evt.data.position);
@@ -185 +185 @@
 
         /** Load the configuration array. **/
-        private function stopHandler(evt:ControllerEvent=undefined) {
+        private function stopHandler(evt:ControllerEvent=undefined):void {
                 currentURL = undefined;
                 if(currentModel) {
@@ -197 +197 @@
 
         /**  Dispatch events. State switch is saved. **/
-        public function sendEvent(typ:String,dat:Object) {
+        public function sendEvent(typ:String,dat:Object):void {
                 if(typ == ModelEvent.STATE && dat.newstate != config['state']) {
                         dat.oldstate = config['state'];
@@ -215 +215 @@
 
         /** Load a thumb on stage. **/
-        private function thumbLoader() {
+        private function thumbLoader():void {
                 var img = playlist[config['item']]['image'];
                 if(img) {
@@ -223 +223 @@
 
         /** Place a loaded thumb on stage. **/
-        private function thumbHandler(evt:Event=null) {
+        private function thumbHandler(evt:Event=null):void {
                 mediaHandler(loader);
         };
@@ -229 +229 @@
 
         /** Load the configuration array. **/
-        private function volumeHandler(evt:ControllerEvent) {
+        private function volumeHandler(evt:ControllerEvent):void {
                 if(currentModel) {
                         models[currentModel].volume(evt.data.percentage);

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

@@ -63 +63 @@
                 token:undefined,
                 tracecall:undefined,
-                version:'4.1.55'
+                version:'4.1.56'
         };
         /** Object that loads all configuration variables. **/
@@ -80 +80 @@
 
         /** Constructor; Loads config parameters. **/
-        public function Player() {
+        public function Player():void {
                 visible = false;
                 plugins = new Array();
@@ -90 +90 @@
 
         /** Config loading completed; now load skin. **/
-        private function configHandler(evt:Event) {
+        private function configHandler(evt:Event):void {
                 loader = new SWFLoader(this);
                 loader.addEventListener(Event.INIT,skinHandler);
@@ -99 +99 @@
 
         /** Skin loading completed, now load MVC and plugins. **/
-        private function skinHandler(evt:Event) {
+        private function skinHandler(evt:Event):void {
                 controller = new Controller(configger.config,loader.skin);
                 model = new Model(configger.config,loader.skin,controller);
@@ -116 +116 @@
         * @prm plg              Any object that implements the PluginInterface.
         **/
-        public function addPlugin(plg:Object) {
+        public function addPlugin(plg:Object):void {
                 plugins.push(plg);
         };
@@ -122 +122 @@
 
         /** Plugin loading completed; let's start! **/
-        private function pluginHandler(evt:Event=null) {
+        private function pluginHandler(evt:Event=null):void {
                 for(var i=0; i<plugins.length; i++) { plugins[i].initializePlugin(_view); }
                 controller.start(model,_view);

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

@@ -35 +35 @@
         * @param ply    The player instance.
         **/
-        public function SWFLoader(ply:MovieClip) {
+        public function SWFLoader(ply:MovieClip):void {
                 player = ply;
                 amount = 0;
@@ -46 +46 @@
         * @prm pgi              A commaseparated list with plugins. 
         **/
-        public function loadPlugins(pgi:String=null) {
+        public function loadPlugins(pgi:String=null):void {
                 if(pgi) {
                         var arr = pgi.split(',');
@@ -62 +62 @@
         * @param cfg    Object that contains all configuration parameters.
         **/
-        public function loadSkin(skn:String=null) {
+        public function loadSkin(skn:String=null):void {
                 if(skn) {
                         loadSWF(skn,true);
@@ -73 +73 @@
 
         /** Load a particular SWF file. **/
-        public function loadSWF(str:String,skn:Boolean) {
+        public function loadSWF(str:String,skn:Boolean):void {
                 if(str.substr(-4) != '.swf') { str += '.swf'; }
                 var ldr = new Loader();
@@ -98 +98 @@
 
         /** SWF loading failed; use default skin. **/
-        private function pluginError(evt:IOErrorEvent) {
+        private function pluginError(evt:IOErrorEvent):void {
                 amount--;
                 if (amount == 0) {
@@ -107 +107 @@
 
         /** Plugin loading completed; add to stage and populate. **/
-        private function pluginHandler(evt:Event) {
+        private function pluginHandler(evt:Event):void {
                 var clp = evt.target.content;
                 player.addPlugin(clp);
@@ -118 +118 @@
 
         /** SWF loading failed; use default skin. **/
-        private function skinError(evt:IOErrorEvent=null) {
+        private function skinError(evt:IOErrorEvent=null):void {
                 skin = player['player'];
                 dispatchEvent(new Event(Event.INIT));
@@ -125 +125 @@
 
         /** Skin loading completed; add to stage and populate. **/
-        private function skinHandler(evt:Event) {
+        private function skinHandler(evt:Event):void {
                 var clp = evt.target.content;
                 if(clp['player']) {

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

@@ -36 +36 @@
 
         /** Constructor, save references and subscribe to events. **/
-        public function View(cfg:Object,skn:MovieClip,ctr:Controller,mdl:Model) {
+        public function View(cfg:Object,skn:MovieClip,ctr:Controller,mdl:Model):void {
                 _config = cfg;
                 _config['client'] = 'FLASH '+Capabilities.version;
@@ -77 +77 @@
 
         /** jump to the about page. **/
-        private function aboutSetter(evt:ContextMenuEvent) {
+        private function aboutSetter(evt:ContextMenuEvent):void {
                 navigateToURL(new URLRequest(config['aboutlink']),'_blank');
         };
@@ -83 +83 @@
 
         /**  Subscribers to the controller and model. **/
-        override public function addControllerListener(typ:String,fcn:Function) {
+        override public function addControllerListener(typ:String,fcn:Function):void {
                 controller.addEventListener(typ.toUpperCase(),fcn);
         };
@@ -90 +90 @@
                 return true;
         };
-        override public function addModelListener(typ:String,fcn:Function) {
+        override public function addModelListener(typ:String,fcn:Function):void {
                 model.addEventListener(typ.toUpperCase(),fcn);
         };
@@ -97 +97 @@
                 return true;
         };
-        override public function addViewListener(typ:String,fcn:Function) {
+        override public function addViewListener(typ:String,fcn:Function):void {
                 this.addEventListener(typ.toUpperCase(),fcn);
         };
@@ -107 +107 @@
 
         /** Send event to listeners and tracers. **/
-        private function forward(tgt:String,typ:String,dat:Object) {
+        private function forward(tgt:String,typ:String,dat:Object):void {
                 var prm = '';
                 for (var i in dat) { prm += i+':'+dat[i]+','; }
@@ -131 +131 @@
 
         /** Toggle the fullscreen mode. **/
-        private function fullscreenSetter(evt:ContextMenuEvent) { sendEvent('fullscreen'); };
+        private function fullscreenSetter(evt:ContextMenuEvent):void { sendEvent('fullscreen'); };
 
 
         /** Add a custom menu item. **/
-        private function menuAdd(itm:ContextMenuItem,hdl:Function) {
+        private function menuAdd(itm:ContextMenuItem,hdl:Function):void {
                 itm.addEventListener(ContextMenuEvent.MENU_ITEM_SELECT,hdl);
                 itm.separatorBefore = true;
@@ -143 +143 @@
 
         /** Set the rightclick menu. **/
-        private function menuSet() {
+        private function menuSet():void {
                 context = new ContextMenu();
                 context.hideBuiltInItems();
@@ -169 +169 @@
 
         /** Send a call to javascript that the player is ready. **/
-        private function playerReady() {
+        private function playerReady():void {
                 var dat = {
                         id:config['id'],
@@ -182 +182 @@
 
         /** Toggle the smoothing mode. **/
-        private function qualityHandler(evt:ControllerEvent) {
+        private function qualityHandler(evt:ControllerEvent):void {
                 if(evt.data.state == true) {
                         context.customItems[0].caption = "Switch to low quality";
@@ -192 +192 @@
 
         /** Toggle the smoothing mode. **/
-        private function qualitySetter(evt:ContextMenuEvent) { sendEvent('quality'); };
+        private function qualitySetter(evt:ContextMenuEvent):void { sendEvent('quality'); };
 
 
         /** Set the fullscreen menubutton. **/
-        private function resizeHandler(evt:ControllerEvent) {
+        private function resizeHandler(evt:ControllerEvent):void {
                 if(evt.data.fullscreen == false) { 
                         context.customItems[1].caption = "Switch to fullscreen";
@@ -206 +206 @@
 
         /** Forward a resizing of the stage. **/
-        private function resizeSetter(evt:Event=undefined) {
+        private function resizeSetter(evt:Event=undefined):void {
                 var dat = {
                         height:_skin.stage.stageHeight,
@@ -216 +216 @@
 
         /**  Dispatch events. **/
-        override public function sendEvent(typ:String,prm:Object=undefined) {
+        override public function sendEvent(typ:String,prm:Object=undefined):void {
                 typ = typ.toUpperCase();
                 var dat = new Object();
@@ -257 +257 @@
 
         /** Forward events to tracer and subscribers. **/
-        private function setController(evt:ControllerEvent) { forward('CONTROLLER',evt.type,evt.data); };
-        private function setModel(evt:ModelEvent) { forward('MODEL',evt.type,evt.data); };
-        private function setView(evt:ViewEvent) { forward('VIEW',evt.type,evt.data); };
+        private function setController(evt:ControllerEvent):void { forward('CONTROLLER',evt.type,evt.data); };
+        private function setModel(evt:ModelEvent):void { forward('MODEL',evt.type,evt.data); };
+        private function setView(evt:ViewEvent):void { forward('VIEW',evt.type,evt.data); };
 
 
         /** Setup listeners to all events for tracing / javascript. **/
-        private function setListening() {
+        private function setListening():void {
                 addControllerListener(ControllerEvent.ERROR,setController);
                 addControllerListener(ControllerEvent.ITEM,setController);

trunk/as3/com/jeroenwijering/plugins/Captions.as

@@ -36 +36 @@
 
 
-        public function Captions() {};
+        public function Captions():void {};
 
 
         /** Initing the plugin. **/
-        public function initializePlugin(vie:AbstractView) {
+        public function initializePlugin(vie:AbstractView):void {
                 view = vie;
                 if(!view.skin['captions']) { return; }
@@ -56 +56 @@
 
         /** Check for captions with a new item. **/
-        private function itemHandler(evt:ControllerEvent) {
+        private function itemHandler(evt:ControllerEvent):void {
                 current = -1;
                 setCaption('');
@@ -74 +74 @@
 
         /** Captions are loaded; now display them. **/
-        private function loaderHandler(evt:Event) {
+        private function loaderHandler(evt:Event):void {
                 try {
                         var dat = XML(evt.target.data);
@@ -91 +91 @@
 
         /** Resize the captions if the display changes. **/
-        private function resizeHandler(evt:ControllerEvent=undefined) {
+        private function resizeHandler(evt:ControllerEvent=undefined):void {
                 clip.back.height = clip.field.height+15;
                 clip.width = view.config['width'];
@@ -100 +100 @@
 
         /** Catch and display captions that are sent through metadata. **/
-        private function metaHandler(evt:ModelEvent) {
+        private function metaHandler(evt:ModelEvent):void {
                 if (evt.data.text != undefined && evt.data.trackid != undefined) {
                         setCaption(evt.data.text);
@@ -110 +110 @@
 
         /** Set a caption on screen. **/
-        private function setCaption(txt:String) {
+        private function setCaption(txt:String):void {
                 clip.visible = true;
                 clip.field.htmlText = txt;
@@ -118 +118 @@
 
         /** Check the playback state; hide captions if not playing. **/
-        private function stateHandler(evt:ModelEvent) {
+        private function stateHandler(evt:ModelEvent):void {
                 if(view.config['caption'] == true) {
                         clip.visible = true;
@@ -128 +128 @@
 
         /** Check timing of the player to sync captions.  **/
-        private function timeHandler(evt:ModelEvent) {
+        private function timeHandler(evt:ModelEvent):void {
                 var cur = -1;
                 var pos = evt.data.position;

trunk/as3/com/jeroenwijering/plugins/Controlbar.as

@@ -56 +56 @@
 
         /** Constructor. **/
-        public function Controlbar() {};
+        public function Controlbar():void {};
 
 
         /** Initialize from view. **/
-        public function initializePlugin(vie:AbstractView) {
+        public function initializePlugin(vie:AbstractView):void {
                 view = vie;
                 view.addControllerListener(ControllerEvent.RESIZE,resizeHandler);
@@ -86 +86 @@
 
         /** Handle clicks from all buttons. **/
-        private function clickHandler(evt:MouseEvent) {
+        private function clickHandler(evt:MouseEvent):void {
                 view.sendEvent(BUTTONS[evt.target.name]);
         };
@@ -92 +92 @@
 
         /** Handle mouse presses on sliders. **/
-        private function downHandler(evt:MouseEvent) {
+        private function downHandler(evt:MouseEvent):void {
                 var tgt = evt.target;
                 var rct = new Rectangle(tgt.rail.x,tgt.icon.y,tgt.rail.width-tgt.icon.width,0);
@@ -102 +102 @@
 
         /** Fix the timeline display. **/
-        private function fixTime() {
+        private function fixTime():void {
                 try {
                         var scp = bar.timeSlider.scaleX;
@@ -115 +115 @@
 
         /** Handle a change in the current item **/
-        private function itemHandler(evt:ControllerEvent=null) {
+        private function itemHandler(evt:ControllerEvent=null):void {
                 try {
                         if(view.playlist && view.playlist.length > 1) {
@@ -137 +137 @@
 
         /** Process bytesloaded updates given by the model. **/
-        private function loadedHandler(evt:ModelEvent=null) {
+        private function loadedHandler(evt:ModelEvent=null):void {
                 var pc1 = 0;
                 if(evt && evt.data.total > 0) {
@@ -155 +155 @@
 
         /** Show above controlbar on mousemove. **/
-        private function moveHandler(evt:MouseEvent=null) {
+        private function moveHandler(evt:MouseEvent=null):void {
                 if(bar.alpha == 0) { Animations.fade(bar,1); }
                 clearTimeout(hiding);
@@ -164 +164 @@
 
         /** Hide above controlbar again when move has timed out. **/
-        private function moveTimeout() {
+        private function moveTimeout():void {
                 if((bar.mouseY<0 || bar.mouseY>bar.height)  && bar.alpha == 1) {
                         Animations.fade(bar,0);
@@ -173 +173 @@
 
         /** Show a mute icon if playing. **/
-        private function muteHandler(evt:ControllerEvent=null) {
+        private function muteHandler(evt:ControllerEvent=null):void {
                 try {
                         if(view.config['mute'] == true) {
@@ -191 +191 @@
 
         /** Handle mouseouts from all buttons **/
-        private function outHandler(evt:MouseEvent) {
+        private function outHandler(evt:MouseEvent):void {
                 if(front) { 
                         bar[evt.target.name]['icon'].transform.colorTransform = front;
@@ -201 +201 @@
 
         /** Handle clicks from all buttons **/
-        private function overHandler(evt:MouseEvent) {
+        private function overHandler(evt:MouseEvent):void {
                 if(light) { 
                         bar[evt.target.name]['icon'].transform.colorTransform = light;
@@ -211 +211 @@
 
         /** Process resizing requests **/
-        private function resizeHandler(evt:ControllerEvent=null) {
+        private function resizeHandler(evt:ControllerEvent=null):void {
                 var wid = stacker.width;
                 if(view.config['controlbar'] == 'over' || (evt && evt.data.fullscreen == true)) {
@@ -256 +256 @@
 
         /** Clickhandler for all buttons. **/
-        private function setButtons() {
+        private function setButtons():void {
                 for(var btn in BUTTONS) {
                         if(bar[btn]) {
@@ -279 +279 @@
 
         /** Init the colors. **/
-        private function setColors() {
+        private function setColors():void {
                 if(view.config['backcolor']) { 
                         var clr = new ColorTransform();
@@ -313 +313 @@
 
         /** Process state changes **/
-        private function stateHandler(evt:ModelEvent=undefined) {
+        private function stateHandler(evt:ModelEvent=undefined):void {
                 clearTimeout(hiding);
                 view.skin.removeEventListener(MouseEvent.MOUSE_MOVE,moveHandler);
@@ -347 +347 @@
 
         /** Process time updates given by the model. **/
-        private function timeHandler(evt:ModelEvent=null) {
+        private function timeHandler(evt:ModelEvent=null):void {
                 var dur = 0;
                 var pos = 0;
@@ -380 +380 @@
 
         /** Handle mouse releases on sliders. **/
-        private function upHandler(evt:MouseEvent) {
+        private function upHandler(evt:MouseEvent):void {
                 var tgt = evt.target;
                 var mpl = 0;
@@ -397 +397 @@
 
         /** Reflect the new volume in the controlbar **/
-        private function volumeHandler(evt:ControllerEvent=null) {
+        private function volumeHandler(evt:ControllerEvent=null):void {
                 try { 
                         var vsl = bar.volumeSlider;

trunk/as3/com/jeroenwijering/plugins/Display.as

@@ -43 +43 @@
 
         /** Constructor; add all needed listeners. **/
-        public function Display() {};
+        public function Display():void {};
 
 
         /** Initialize the plugin. **/
-        public function initializePlugin(vie:AbstractView) {
+        public function initializePlugin(vie:AbstractView):void {
                 view = vie;
                 view.addControllerListener(ControllerEvent.ERROR,errorHandler);
@@ -77 +77 @@
 
         /** Receive buffer updates. **/
-        private function bufferHandler(evt:ModelEvent) {
+        private function bufferHandler(evt:ModelEvent):void {
                 var pct = '';
                 if(evt.data.percentage > 0) {
@@ -89 +89 @@
 
         /** Process a click on the display. **/
-        private function clickHandler(evt:MouseEvent) {
+        private function clickHandler(evt:MouseEvent):void {
                 view.sendEvent(view.config['displayclick']);
         };
@@ -95 +95 @@
 
         /** Receive and print errors. **/
-        private function errorHandler(evt:Object) {
+        private function errorHandler(evt:Object):void {
                 setIcon('errorIcon');
                 try { 
@@ -104 +104 @@
 
         /** Logo loaded; now position it. **/
-        private function logoHandler(evt:Event) {
+        private function logoHandler(evt:Event):void {
                 if(margins[0] > margins[2]) { 
                         display.logo.x = display.back.width- margins[2]-display.logo.width;
@@ -119 +119 @@
 
         /** Receive resizing requests **/
-        private function resizeHandler(evt:ControllerEvent=null) {
+        private function resizeHandler(evt:ControllerEvent=null):void {
                 var wid = view.config['width'];
                 var hei = view.config['height'];
@@ -146 +146 @@
 
         /** Set a specific icon in the display. **/
-        private function setIcon(icn:String=undefined) {
+        private function setIcon(icn:String=undefined):void {
                 for(var i in ICONS) {
                         if(display[ICONS[i]]) { 
@@ -160 +160 @@
 
         /** Setup the logo loading. **/
-        private function setLogo() {
+        private function setLogo():void {
                 margins = new Array(
                         display.logo.x,
@@ -175 +175 @@
 
         /** Handle a change in playback state. **/
-        private function stateHandler(evt:ModelEvent=null) {
+        private function stateHandler(evt:ModelEvent=null):void {
                 state = view.config['state'];
                 if(state == ModelStates.PLAYING) {

trunk/as3/com/jeroenwijering/plugins/Playlist.as

@@ -45 +45 @@
 
 
-        public function Playlist() {};
+        public function Playlist():void {};
 
 
         /** Initialize the communication with the player. **/
-        public function initializePlugin(vie:AbstractView) {
+        public function initializePlugin(vie:AbstractView):void {
                 view = vie;
                 view.addControllerListener(ControllerEvent.ITEM,itemHandler);
@@ -78 +78 @@
 
         /** Setup all buttons in the playlist **/
-        private function buildList(clr:Boolean) {
+        private function buildList(clr:Boolean):void {
                 if(!view.playlist) { return; }
                 var wid = clip.back.width;
@@ -118 +118 @@
 
         /** Setup the scrollbar component **/
-        private function buildSlider() {
+        private function buildSlider():void {
                 var scr = clip.slider;
                 scr.visible = true;
@@ -130 +130 @@
 
         /** Handle a click on a button. **/
-        private function clickHandler(evt:MouseEvent) {
+        private function clickHandler(evt:MouseEvent):void {
                 view.sendEvent('item',Number(evt.target.name));
         };
@@ -136 +136 @@
 
         /** Switch the currently active item */
-        private function itemHandler(evt:ControllerEvent) {
+        private function itemHandler(evt:ControllerEvent):void {
                 var idx = view.config['item'];
                 if(buttons[idx]) {
@@ -156 +156 @@
 
         /** Loading of image completed; resume loading **/
-        private function loaderHandler(evt:Event) {
+        private function loaderHandler(evt:Event):void {
                 var ldr = Loader(evt.target.loader);
                 Stretcher.stretch(ldr,image[0],image[1],Stretcher.EXACTFIT);
@@ -163 +163 @@
 
         /** Handle a button rollover. **/
-        private function overHandler(evt:MouseEvent) {
+        private function overHandler(evt:MouseEvent):void {
                 var idx = Number(evt.target.name);
                 if(light) { 
@@ -178 +178 @@
 
         /** Handle a button rollover. **/
-        private function outHandler(evt:MouseEvent) {
+        private function outHandler(evt:MouseEvent):void {
                 var idx = Number(evt.target.name);
                 if(front) {
@@ -195 +195 @@
 
         /** New playlist loaded: rebuild the playclip. **/
-        private function playlistHandler(evt:ControllerEvent) {
+        private function playlistHandler(evt:ControllerEvent):void {
                 active = undefined;
                 if(view.config['playlist'] != 'none') {
@@ -204 +204 @@
 
         /** Process resizing requests **/
-        private function resizeHandler(evt:ControllerEvent) {
+        private function resizeHandler(evt:ControllerEvent):void {
                 if(view.config['playlist'] == 'right') {
                         clip.x = evt.data.width;
@@ -232 +232 @@
 
         /** Make sure the playlist is not out of range. **/
-        private function scrollCheck() {
+        private function scrollCheck():void {
                 var scr = clip.slider;
                 if(clip.list.y > 0 || scr.icon.y < scr.rail.y) {
@@ -246 +246 @@
 
         /** Scrolling handler. **/
-        private function scrollHandler() {
+        private function scrollHandler():void {
                 var scr = clip.slider;
                 var yps = scr.mouseY;
@@ -258 +258 @@
 
         /** Init the colors. **/
-        private function setColors() {
+        private function setColors():void {
                 if(view.config['backcolor']) { 
                         back = new ColorTransform();
@@ -280 +280 @@
 
         /** Setup button elements **/
-        private function setContents(idx:Number) {
+        private function setContents(idx:Number):void {
                 for (var itm in view.playlist[idx]) {
                         if(!buttons[idx].c[itm]) {
@@ -323 +323 @@
 
         /** Start scrolling the playlist on mousedown. **/
-        private function sdownHandler(evt:MouseEvent) {
+        private function sdownHandler(evt:MouseEvent):void {
                 clearInterval(scrollInterval);
         clip.stage.addEventListener(MouseEvent.MOUSE_UP,supHandler);
@@ -332 +332 @@
 
         /** Revert the highlight on mouseout. **/
-        private function soutHandler(evt:MouseEvent) {
+        private function soutHandler(evt:MouseEvent):void {
                 if(front) {
                         clip.slider.icon.transform.colorTransform = front;
@@ -342 +342 @@
 
         /** Highlight the icon on rollover. **/
-        private function soverHandler(evt:MouseEvent) {
+        private function soverHandler(evt:MouseEvent):void {
                 if(light) {
                         clip.slider.icon.transform.colorTransform = light;
@@ -352 +352 @@
 
         /** Stop scrolling the playlist on mouseout. **/
-        private function supHandler(evt:MouseEvent) {
+        private function supHandler(evt:MouseEvent):void {
                 clearInterval(scrollInterval);
         clip.stage.removeEventListener(MouseEvent.MOUSE_UP,supHandler);
@@ -359 +359 @@
 
         /** Process state changes **/
-        private function stateHandler(evt:ModelEvent) {
+        private function stateHandler(evt:ModelEvent):void {
                 if(view.config['playlist'] == 'over') {
                         if(evt.data.newstate == ModelStates.PLAYING || 
@@ -372 +372 @@
 
         /** Process mousewheel usage. **/
-        private function wheelHandler(evt:MouseEvent) {};
+        private function wheelHandler(evt:MouseEvent):void {};
 
 

trunk/as3/com/jeroenwijering/utils/Animations.as

@@ -21 +21 @@
         * @param spd    The amount of alpha change per frame.
         **/
-        public static function fade(tgt:MovieClip,end:Number=1,spd:Number=0.2) {
+        public static function fade(tgt:MovieClip,end:Number=1,spd:Number=0.2):void {
                 if(tgt.alpha > end) {
                         tgt.spd = -Math.abs(spd);
@@ -33 +33 @@
 
         /** The fade enterframe function. **/
-        private static function fadeHandler(evt:Event) {
+        private static function fadeHandler(evt:Event):void {
                 var tgt = MovieClip(evt.target);
                 if((tgt.alpha >= tgt.end-tgt.spd && tgt.spd > 0) ||
@@ -55 +55 @@
         * @param spd    The movement speed (1 - 2).
         **/
-        public static function ease(tgt:MovieClip,xps:Number,yps:Number,spd:Number=2) {
+        public static function ease(tgt:MovieClip,xps:Number,yps:Number,spd:Number=2):void {
                 if(!xps) { tgt.xps = tgt.x; } else { tgt.xps = xps; }
                 if(!yps) { tgt.yps = tgt.y; } else { tgt.yps = yps; }
@@ -64 +64 @@
 
         /** The ease enterframe function. **/
-        private static function easeHandler(evt:Event) {
+        private static function easeHandler(evt:Event):void {
                 var tgt = MovieClip(evt.target);
                 if(Math.abs(tgt.x - tgt.xps) < 1 && Math.abs(tgt.y - tgt.yps) < 1) {
@@ -84 +84 @@
         * @param spd    The speed of typing (1 - 2).
         **/
-        public static function write(tgt:MovieClip,str:String,spd:Number=1.5) {
+        public static function write(tgt:MovieClip,str:String,spd:Number=1.5):void {
                 tgt.str = str;
                 tgt.spd = spd;
@@ -93 +93 @@
 
         /** The write enterframe function. **/
-        private static function writeHandler(evt:Event) {
+        private static function writeHandler(evt:Event):void {
                 var tgt = MovieClip(evt.target);
                 var dif = Math.floor((tgt.str.length-tgt.tf.text.length)/tgt.spd);

trunk/as3/com/jeroenwijering/utils/Configger.as

@@ -26 +26 @@
 
         /** Constructor; nothing fancy. **/
-        public function Configger(ref:Sprite) {
+        public function Configger(ref:Sprite):void {
                 reference = ref;
         };
@@ -36 +36 @@
         * @param def    The config object to overwrite new data in.
         **/
-        public function load(def:Object) {
+        public function load(def:Object):void {
                 config = def;
                 var xml = reference.root.loaderInfo.parameters['config'];
@@ -48 +48 @@
 
         /** Load configuration data from external XML file. **/
-        private function loadXML(url:String) {
+        private function loadXML(url:String):void {
                 loader = new URLLoader();
                 loader.addEventListener(Event.COMPLETE,xmlHandler);
@@ -58 +58 @@
 
         /** Parse the XML list **/
-        private function xmlHandler(evt:Event) {
+        private function xmlHandler(evt:Event):void {
                 var dat = XML(evt.currentTarget.data);
                 var obj = new Object();
@@ -70 +70 @@
 
         /** Set config variables or load them from flashvars. **/
-        private function loadFlashvars() {
+        private function loadFlashvars():void {
                 compareWrite(reference.root.loaderInfo.parameters);
                 dispatchEvent(new Event(Event.COMPLETE));
@@ -77 +77 @@
 
         /** Compare and save new items in config, preserving datatype. **/
-        private function compareWrite(obj:Object) {
+        private function compareWrite(obj:Object):void {
                 for(var cfv in obj) {
                         var lfv = cfv.toLowerCase();

trunk/as3/com/jeroenwijering/utils/Draw.as

@@ -19 +19 @@
         * @param tgt    Displayobject to clear.
         **/
-        public static function clear(tgt:Sprite) {
+        public static function clear(tgt:Sprite):void {
                 var len = tgt.numChildren;
                 for(var i=0; i<len; i++) {

trunk/as3/com/jeroenwijering/utils/NetClient.as

@@ -13 +13 @@
 
         /** Constructor. **/
-        public function NetClient(cbk:Object) {
+        public function NetClient(cbk:Object):void {
                 callback = cbk;
         };
@@ -19 +19 @@
 
         /** Forward calls to callback **/
-        private function forward(dat:Object) {
+        private function forward(dat:Object):void {
                 callback.onData(dat);
         };
@@ -25 +25 @@
 
         /** Handler for captionate events. **/
-        public function onBWDone() {
+        public function onBWDone():void {
                 var dat = {type:'bwdone'};
                 forward(dat);
@@ -32 +32 @@
 
         /** Handler for captionate events. **/
-        public function onCaption(cps:String,spk:Number) {
+        public function onCaption(cps:String,spk:Number):void {
                 var dat = {type:'caption',captions:cps,speaker:spk};
                 forward(dat);
@@ -39 +39 @@
 
         /** Handler for captionate events. **/
-        public function onCaptionInfo(obj:Object) {
+        public function onCaptionInfo(obj:Object):void {
                 var dat = {type:'captioninfo'};
                 for(var i in obj) { dat[i] = obj[i]; }
@@ -47 +47 @@
 
         /** Handler for captionate events. **/
-        public function onCuePoint(obj:Object) {
+        public function onCuePoint(obj:Object):void {
                 var dat = {type:'cuepoint'};
                 for(var i in obj) { dat[i] = obj[i]; }
@@ -55 +55 @@
 
         /** Some Limelight crap. **/
-        public function onFCSubscribe(obj:Object) {
+        public function onFCSubscribe(obj:Object):void {
                 var dat = {type:'fcsubscribe'};
                 for(var i in obj) { dat[i] = obj[i]; }
@@ -63 +63 @@
 
         /** Get image data from netstream. **/
-        public function onImageData(obj:Object) {
+        public function onImageData(obj:Object):void {
                 var dat = {type:'imagedata'};
                 forward(obj);
@@ -70 +70 @@
 
         /** Handler for LaasstSecond call. **/
-        public function onLastSecond(obj:Object) {
+        public function onLastSecond(obj:Object):void {
                 var dat = {type:'lastsecond'};
                 forward(dat);
@@ -77 +77 @@
 
         /** Get metadata information from netstream class. **/
-        public function onMetaData(obj:Object) {
+        public function onMetaData(obj:Object):void {
                 var dat = {type:'metadata'};
                 for(var i in obj) { dat[i] = obj[i]; }
@@ -89 +89 @@
 
         /** Receive NetStream playback codes. **/
-        public function onPlayStatus(dat:Object) {
+        public function onPlayStatus(dat:Object):void {
                 if(dat.code == "NetStream.Play.Complete") {
                         var dat = {type:'complete'};
@@ -98 +98 @@
 
         /** RTMP Sample callback. **/
-        public function RtmpSampleAccess(obj:Object) {
+        public function RtmpSampleAccess(obj:Object):void {
                 var dat = {type:'rtmpsampleaccess'};
                 forward(dat);
@@ -105 +105 @@
 
         /** Get textdata from netstream. **/
-        public function onTextData(obj:Object) {
+        public function onTextData(obj:Object):void {
                 var dat = {type:'textdata'};
                 for(var i in obj) { dat[i] = obj[i]; }

trunk/as3/com/jeroenwijering/utils/Playlister.as

@@ -23 +23 @@
 
         /** Constructor. **/
-        public function Playlister() {
+        public function Playlister():void {
                 loader = new URLLoader();
                 loader.addEventListener(Event.COMPLETE,loaderHandler);
@@ -33 +33 @@
 
         /** Determine filetype and load file or list. **/
-        public function load(obj:Object) {
+        public function load(obj:Object):void {
                 if(typeof(obj) == 'string') {
                         var obj = {file:obj};
@@ -65 +65 @@
 
         /** Catch security and io errors **/
-        private function errorHandler(evt:ErrorEvent) {
+        private function errorHandler(evt:ErrorEvent):void {
                 dispatchEvent(new ErrorEvent(ErrorEvent.ERROR,false,false,status+': '+evt.text));
         };
@@ -71 +71 @@
 
         /** Translate the XML object to the feed array. **/
-        private function loaderHandler(evt:Event) {
+        private function loaderHandler(evt:Event):void {
                 try {
                         var dat = XML(evt.target.data);
@@ -106 +106 @@
 
         /** Save the http status **/
-        private function statusHandler(evt:HTTPStatusEvent) {
+        private function statusHandler(evt:HTTPStatusEvent):void {
                 status = evt.status;
         };
@@ -118 +118 @@
 
         /** Handler for manually updating elements. **/
-        public function update(itm:Number,elm:String,val:Object) {
+        public function update(itm:Number,elm:String,val:Object):void {
                 if(_playlist[itm]) {
                         _playlist[itm][elm] = val;

trunk/as3/com/jeroenwijering/utils/Randomizer.as

@@ -21 +21 @@
         * @param len    Length of the list to randomize.
         **/
-        public function Randomizer(len:Number) {
+        public function Randomizer(len:Number):void {
                 original = new Array();
                 todo = new Array();

trunk/as3/com/jeroenwijering/utils/Stacker.as

@@ -28 +28 @@
         * @param skn    The MovieClip to manage stacking of.
         **/
-        public function Stacker(clp:MovieClip) {
+        public function Stacker(clp:MovieClip):void {
                 clip = clp;
                 analyze();
@@ -35 +35 @@
 
         /** Analyze the MovieClip and save its children.  **/
-        private function analyze() {
+        private function analyze():void {
                 _width = clip.width;
                 stack = new Array();
@@ -53 +53 @@
                         if(i!=idx && stack[i].c.visible==true && stack[i].w < _width &&
                                 stack[i].x < max && stack[i].x+stack[i].w > min) {
-                                // trace(stack[idx].n+'overlaps with'+stack[i].n);
-                                // trace(stack[i].x+'-'+max+' / '+(stack[i].x+stack[i].w)+'-'+min);
+                                //trace(stack[idx].n+' overlaps with '+stack[i].n);
+                                //trace(stack[i].x+'-'+max+' / '+(stack[i].x+stack[i].w)+'-'+min);
                                 return true;
                         }
@@ -67 +67 @@
         * @param wid    The target width of the clip.
         **/
-        public function rearrange(wid:Number=undefined) { 
+        public function rearrange(wid:Number=undefined):void {
                 if(wid) { latest = wid; }
                 var rdf = latest-width;
@@ -75 +75 @@
                         if(stack[i].x > width/2) {
                                 stack[i].c.x = stack[i].x + rdf;
+                                //trace(stack[i].n+': docked right');
                                 if(stack[i].c.visible == false && overlaps(i) == false) {
                                         rdf -= stack[i+1].x - stack[i].x;
@@ -80 +81 @@
                         } else {
                                 stack[i].c.x = stack[i].x-ldf;
+                                //trace(stack[i].n+': docked left');
                                 if(stack[i].c.visible == false && overlaps(i) == false) {
                                         if(stack[i-1].w > width/3) {
@@ -89 +91 @@
                         }
                         if(stack[i].w > width/3) {
+                                //trace(stack[i].n+': stretched');
                                 stack[i].c.width = stack[i].w+rdf+ldf;
                         }
@@ -99 +102 @@
                                         stack[j].c.x += dif;
                                 }
-                                if(stack[j].w>width/4 && stack[j].w<width) {
+                                if(stack[j].w > width/3 && stack[j].w < width) {
                                         stack[j].c.width += dif;
                                 }

trunk/as3/com/jeroenwijering/utils/Stretcher.as

@@ -29 +29 @@
         * @param typ    The stretching type.
         **/
-        public static function stretch(clp:DisplayObject,wid:Number,hei:Number,typ:String='uniform') {
+        public static function stretch(clp:DisplayObject,wid:Number,hei:Number,typ:String='uniform'):void {
                 var xsc = wid/clp.width;
                 var ysc = hei/clp.height;

trunk/as3/com/jeroenwijering/utils/TEA.as

@@ -9 +9 @@
 * See http://www.movable-type.co.uk/scripts/TEAblock.html
 *
-* Took the liberty of renaming this so all JW Player utils are in one package..
+* JW took the liberty of renaming this so all JW Player utils are in one package..
 */
 package com.jeroenwijering.utils {