Changeset 5

Timestamp:

06/07/08 07:17:23 (18 months ago)

Author:

jeroen

Message:

fixed media display, rollovers and sliders

Location:

trunk/as3

Files:

• com/jeroenwijering/models/HTTPModel.as (modified) (1 diff)
• com/jeroenwijering/parsers/ObjectParser.as (modified) (1 diff)
• com/jeroenwijering/player/Model.as (modified) (7 diffs)
• com/jeroenwijering/player/Player.as (modified) (5 diffs)
• com/jeroenwijering/player/View.as (modified) (1 diff)
• com/jeroenwijering/utils/Animations.as (added)
• com/jeroenwijering/utils/Configger.as (modified) (1 diff)
• com/jeroenwijering/views/ControlbarView.as (modified) (13 diffs)
• com/jeroenwijering/views/DisplayView.as (modified) (3 diffs)
• com/jeroenwijering/views/KeyboardView.as (modified) (1 diff)
• com/jeroenwijering/views/PlaylistView.as (modified) (6 diffs)
• player.fla (modified) (previous)
• player.swf (modified) (previous)

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

@@ -108 +108 @@
                         }
                 } else {
-                        url = model.config["streamscript"]+"?file="+url+'&start='+offset;
+                        if(model.config["streamscript"].indexOf('?') > -1) { 
+                                url = model.config["streamscript"]+"&file="+url+'&start='+offset;
+                        } else {
+                                url = model.config["streamscript"]+"?file="+url+'&start='+offset;
+                        }
                 }
                 url += '&width='+model.config['width'];
                 url += '&client='+encodeURI(model.config['client']);
-                trace(url);
+                url += '&version='+encodeURI(model.config['version']);
                 stream.play(url);
                 clearInterval(loadinterval);

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

@@ -94 +94 @@
         /** Detect the mediatype of a playlistitem and save to its type var. **/
         public static function detect(itm:Object):Object {
-                if(ObjectParser.TYPES[itm['type']] != undefined) {
+                if(itm['file'] == undefined) { 
+                        return itm;
+                } else if(ObjectParser.TYPES[itm['type']] != undefined) {
                         // assume the developer knows what he does...
                 } else if(itm['file'].substr(0,4) == 'rtmp') {

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

@@ -53 +53 @@
         /** Item change: switch the curently active model if there's a new URL **/
         private function itemHandler(evt:ControllerEvent) {
-                // skin.display.media.visible = false;
+                skin.display.media.visible = false;
                 if(current) { current.stop(); }
                 sendEvent(ModelEvent.STATE,{newstate:ModelStates.IDLE});
@@ -81 +81 @@
                 }
                 if(playlist[evt.data.index]['image']) {
-                        // skin.display.thumb.visible = true;
+                        skin.display.thumb.visible = true;
                         loader.load(new URLRequest(playlist[evt.data.index]['image']));
                 } else {
-                        // skin.display.thumb.visible = false;
+                        skin.display.thumb.visible = false;
                 }
         };
@@ -91 +91 @@
         /** Place a loaded thumb on stage. **/
         private function thumbHandler(evt:Event) {
-                /*
                 var obj = skin.display.thumb;
                 Draw.clear(obj);
@@ -97 +96 @@
                 Bitmap(loader.content).smoothing = config['quality'];
                 Stretcher.stretch(obj,config['width'],config['height'],config['stretching']);
-                */
         };
 
@@ -103 +101 @@
         /** Place a loaded mediafile on stage **/
         public function mediaHandler(chd:DisplayObject) {
-                /*
                 var obj = skin.display.media;
                 Draw.clear(obj);
@@ -110 +107 @@
                 skin.display.thumb.visible = false;
                 skin.display.media.visible = true;
-                */
         };
 
@@ -148 +144 @@
         /** Resize the media and thumb. **/
         private function resizeHandler(evt:ControllerEvent) {
-                /*
                 Stretcher.stretch(skin.display.thumb,evt.data.width,evt.data.height,config['stretching']);
                 Stretcher.stretch(skin.display.media,evt.data.width,evt.data.height,config['stretching']);
-                */
         };
 

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

@@ -21 +21 @@
                 description:undefined,
                 duration:0,
-                file:'http://www.jeroenwijering.com/upload/xspf.xml',
+                file:undefined,
                 image:undefined,
                 link:undefined,
@@ -28 +28 @@
                 type:undefined,
 
-                controlbar:'over',
+                controlbar:'bottom',
                 logo:undefined,
-                playlist:'bottom',
+                playlist:'none',
                 playlistsize:180,
                 skin:undefined,
@@ -37 +37 @@
                 bufferlength:1,
                 caption:true,
-                digits:true,
                 displayclick:'play',
                 fullscreen:false,
@@ -45 +44 @@
                 repeat:false,
                 shuffle:false,
-                stretching:'uniform',
+                stretching:'fill',
                 volume:80,
 
@@ -57 +56 @@
                 controlbarheight:20,
                 height:300,
+                state:'IDLE',
                 version:'4.0 r3',
                 width:400

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

@@ -43 +43 @@
                 views = new Array();
                 views.push(new CaptionsView(this));
-                views.push(new ControlbarView(this));
                 views.push(new DisplayView(this));
                 views.push(new ExternalView(this));
                 views.push(new KeyboardView(this));
                 views.push(new RightclickView(this));
-                views.push(new PlaylistView(this));
+                if(_skin.controlbar && config['controlbar'] != 'none') {
+                        views.push(new ControlbarView(this));
+                } else { 
+                        _skin.controlbar.visible = false;
+                }
+                if(_skin.playlist && config['playlist'] != 'none') {
+                        views.push(new PlaylistView(this));
+                } else { 
+                        _skin.playlist.visible = false;
+                }
         };
 

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

@@ -2 +2 @@
 * Loads application configuration data (from xml, cookies and flashvars).
 **/
-
-
 package com.jeroenwijering.utils {
 

trunk/as3/com/jeroenwijering/views/ControlbarView.as

@@ -7 +7 @@
 import com.jeroenwijering.events.*;
 import com.jeroenwijering.player.View;
-import com.jeroenwijering.utils.Stacker;
-import com.jeroenwijering.utils.Strings;
+import com.jeroenwijering.utils.*;
 import flash.display.MovieClip;
 import flash.events.MouseEvent;
@@ -14 +13 @@
 import flash.utils.setTimeout;
 import flash.utils.clearTimeout;
-import fl.transitions.*;
-import fl.transitions.easing.*;
 
 
@@ -23 +20 @@
         /** Reference to the view. **/
         private var view:View;
+        /** Reference to the controlbar **/
+        private var bar:MovieClip;
         /** A list with all controls. **/
         private var stacker:Stacker;
-        /** Reference to the controlbar **/
-        private var bar:MovieClip;
-        /** Save whether sliding is enabled. **/
-        private var sliding:Boolean;
         /** Timeout for hiding the bar. **/
         private var hiding:Number;
+        /** The actions for all controlbar buttons. **/
+        private var BUTTONS = {
+                playButton:'PLAY',
+                pauseButton:'PLAY',
+                stopButton:'STOP',
+                prevButton:'PREV',
+                nextButton:'NEXT',
+                linkButton:'LINK',
+                fullscreenButton:'FULLSCREEN',
+                normalscreenButton:'FULLSCREEN',
+                muteButton:'MUTE',
+                unmuteButton:'MUTE'
+        };
 
 
@@ -45 +53 @@
                 bar = view.skin['controlbar'];
                 stacker = new Stacker(bar);
-                bar.addEventListener(MouseEvent.CLICK, clickHandler);
-                bar.timeSlider.addEventListener(MouseEvent.MOUSE_DOWN,timeslideHandler);
-                bar.timeSlider.addEventListener(MouseEvent.MOUSE_OUT,outHandler);
-                bar.volumeSlider.addEventListener(MouseEvent.MOUSE_DOWN,volumeslideHandler);
-                bar.volumeSlider.addEventListener(MouseEvent.MOUSE_OUT,outHandler);
+                setButtons();
                 loadedHandler(new ModelEvent(ModelEvent.LOADED,{loaded:0,total:0}));
                 muteHandler(new ControllerEvent(ControllerEvent.MUTE,{state:view.config['mute']}));
@@ -60 +64 @@
         /** Handle clicks from all buttons **/
         private function clickHandler(evt:MouseEvent) {
-                if(evt.target.name.indexOf('Button') > 0) {
-                        var str = evt.target.name.substr(0,-6).toUpperCase();
-                        view.sendEvent(str);
-                } else if (evt.target.name == 'timeSlider') {
-                        sendScrub(evt);
-                } else if (evt.target.name == 'volumeSlider') {
-                        sendVolume(evt);
-                }
-                sliding = false;
+                view.sendEvent(BUTTONS[evt.target.name]);
         };
 
@@ -83 +79 @@
                 } else { 
                         bar.linkButton.visible = false;
-                }
-                if(view.config['digits'] == false) {
-                        bar.elapsedText.visible = bar.totalText.visible = false;
-                } else { 
-                        bar.elapsedText.visible = bar.totalText.visible = true;
                 }
         };
@@ -112 +103 @@
         /** Show above controlbar on mousemove. **/
         private function moveHandler(evt:MouseEvent) {
-                bar.visible = true;
+                Animations.fade(bar,1);
                 clearTimeout(hiding);
                 hiding = setTimeout(moveTimeout,1000);
@@ -121 +112 @@
         private function moveTimeout() {
                 if(bar.mouseY < -10) {
-                        bar.visible = false;
+                        Animations.fade(bar,0);
                 }
         };
@@ -142 +133 @@
         /** Handle mouseouts from all buttons **/
         private function outHandler(evt:MouseEvent) {
-                if(sliding) { clickHandler(evt); }
+                bar[evt.target.name].gotoAndPlay('out');
+        };
+
+
+        /** Handle clicks from all buttons **/
+        private function overHandler(evt:MouseEvent) {
+                bar[evt.target.name].gotoAndPlay('over');
         };
 
@@ -177 +174 @@
                 }
                 stacker.rearrange(wid);
-                bar.timeSlider.icon.scaleX = 1/bar.timeSlider.scaleX;
-        };
-
-
-        /** Send the new scrub position to the controller **/
-        private function sendScrub(evt:MouseEvent) {
-                bar.timeSlider.icon.stopDrag();
-                var xps = bar.timeSlider.icon.x - bar.timeSlider.rail.x;
-                var dur = view.playlist[view.config['item']]['duration'];
-                var pct = Math.round(xps*dur*10/bar.timeSlider.rail.width)/10;
-                view.sendEvent(ViewEvent.SEEK,pct);
-        }
-
-
-        /** Send the new volume to the controlbar **/
-        private function sendVolume(evt:MouseEvent) {
-                bar.volumeSlider.icon.stopDrag();
-                var xps = bar.volumeSlider.icon.x - bar.volumeSlider.rail.x;
-                var pct = Math.round(xps*100/bar.volumeSlider.mark.width);
-                view.sendEvent(ViewEvent.VOLUME,pct);
+        };
+
+
+        /** Clickhandler for all buttons. **/
+        private function setButtons() {
+                for(var itm in BUTTONS) { 
+                        if(bar[itm]) {
+                                bar[itm].mouseChildren = false;
+                                bar[itm].buttonMode = true;
+                                bar[itm].addEventListener(MouseEvent.CLICK, clickHandler);
+                                bar[itm].addEventListener(MouseEvent.MOUSE_OVER, overHandler);
+                                bar[itm].addEventListener(MouseEvent.MOUSE_OUT, outHandler);
+                        }
+                }
+                bar.timeSlider.mouseChildren = false;
+                bar.timeSlider.buttonMode = true;
+                bar.timeSlider.addEventListener(MouseEvent.MOUSE_DOWN,timedownHandler);
+                bar.timeSlider.addEventListener(MouseEvent.MOUSE_OUT,timeoutHandler);
+                bar.timeSlider.addEventListener(MouseEvent.MOUSE_OVER,timeoverHandler);
+                bar.volumeSlider.mouseChildren = false;
+                bar.volumeSlider.buttonMode = true;
+                bar.volumeSlider.addEventListener(MouseEvent.MOUSE_DOWN,volumedownHandler);
+                bar.volumeSlider.addEventListener(MouseEvent.MOUSE_OUT,volumeoutHandler);
+                bar.volumeSlider.addEventListener(MouseEvent.MOUSE_OVER,volumeoverHandler);
         };
 
@@ -215 +216 @@
                                 if(view.config['controlbar'] == 'over') {
                                         clearTimeout(hiding);
-                                        bar.visible = true;
+                                        Animations.fade(bar,1);
                                         view.skin.removeEventListener(MouseEvent.MOUSE_MOVE, moveHandler);
                                 }
@@ -241 +242 @@
 
 
-        /** Handle a move over the timeslider **/
-        private function timeslideHandler(evt:MouseEvent) {
+        /** Handle a press on the timeslider **/
+        private function timedownHandler(evt:MouseEvent) {
                 var rct = new Rectangle(bar.timeSlider.rail.x,bar.timeSlider.icon.y,bar.timeSlider.rail.width,0);
                 bar.timeSlider.icon.startDrag(true,rct);
-                sliding = true;
+        bar.stage.addEventListener(MouseEvent.MOUSE_UP,timeupHandler);
+        };
+
+        /** Handle a move out the timeslider **/
+        private function timeoutHandler(evt:MouseEvent) {
+                bar.timeSlider.icon.gotoAndPlay('out');
+        };
+
+
+        /** Handle a press release on the timeslider **/
+        private function timeupHandler(evt:MouseEvent) {
+                bar.timeSlider.icon.stopDrag();
+        bar.stage.removeEventListener(MouseEvent.MOUSE_UP,timeupHandler);
+                var xps = bar.timeSlider.icon.x - bar.timeSlider.rail.x;
+                var dur = view.playlist[view.config['item']]['duration'];
+                var pct = Math.round(xps*dur*10/bar.timeSlider.rail.width)/10;
+                view.sendEvent(ViewEvent.SEEK,pct);
+        };
+
+
+        /** Handle a move over the timeslider **/
+        private function timeoverHandler(evt:MouseEvent) {
+                bar.timeSlider.icon.gotoAndPlay('over');
         };
 
@@ -255 +278 @@
 
 
-        /** Handle a move over the volume bar **/
-        private function volumeslideHandler(evt:MouseEvent) {
+        /** Handle a move over the volumebar **/
+        private function volumedownHandler(evt:MouseEvent) {
                 var rct = new Rectangle(bar.volumeSlider.rail.x,bar.volumeSlider.icon.y,bar.volumeSlider.rail.width,0);
                 bar.volumeSlider.icon.startDrag(true,rct);
-                sliding = true;
+                bar.stage.addEventListener(MouseEvent.MOUSE_UP,volumeupHandler);
+        };
+
+
+        /** Handle a move out the volumebar. **/
+        private function volumeoutHandler(evt:MouseEvent) {
+                bar.volumeSlider.icon.gotoAndPlay('out');
+        };
+
+
+        /** Handle a move over the volumebar. **/
+        private function volumeoverHandler(evt:MouseEvent) {
+                bar.volumeSlider.icon.gotoAndPlay('over');
+        };
+
+
+        /** Handle a press release on the volumebar. **/
+        private function volumeupHandler(evt:MouseEvent) {
+                bar.volumeSlider.icon.stopDrag();
+        bar.stage.removeEventListener(MouseEvent.MOUSE_UP,volumeupHandler);
+                var xps = bar.volumeSlider.icon.x - bar.volumeSlider.rail.x;
+                var pct = Math.round(xps*100/bar.volumeSlider.rail.width);
+                view.sendEvent(ViewEvent.VOLUME,pct);
         };
 

trunk/as3/com/jeroenwijering/views/DisplayView.as

@@ -76 +76 @@
         /** Receive and print errors. **/
         private function errorHandler(evt) {
-                display.errorIcon.msg.text = evt.data.message;
                 setIcon('errorIcon');
         };
@@ -112 +111 @@
                 var wid = evt.data.width;
                 var hei = evt.data.height;
+                if(hei > 0) { 
+                        display.visible = true;
+                } else { 
+                        display.visible = false;
+                }
                 display.back.width = display.masker.width = wid;
                 display.back.height = display.masker.height =  hei;
@@ -163 +167 @@
                         setIcon('bufferIcon');
                 } else {
-                        if(view.config['playlist'] == 'over') { 
-                                setIcon();
-                                return;
-                        }
                         switch(view.config.displayclick) {
                                 case 'play':

trunk/as3/com/jeroenwijering/views/KeyboardView.as

@@ -26 +26 @@
         /** Process keyboard events. **/
         private function keyHandler(evt:KeyboardEvent) {
-                trace(evt.keyCode);
                 switch(evt.keyCode) {
                         case 37:

trunk/as3/com/jeroenwijering/views/PlaylistView.as

@@ -47 +47 @@
                 clip.list.button.visible = false;
                 clip.list.mask = clip.masker;
-                clip.slider.buttonMode = true;
-                clip.slider.mouseChildren = false;
                 clip.list.addEventListener(MouseEvent.CLICK,clickHandler);
                 clip.list.addEventListener(MouseEvent.MOUSE_OVER,overHandler);
                 clip.list.addEventListener(MouseEvent.MOUSE_OUT,outHandler);
-                clip.list.addEventListener(MouseEvent.MOUSE_UP,stopHandler);
-                clip.slider.addEventListener(MouseEvent.MOUSE_DOWN,startHandler);
+                clip.slider.buttonMode = true;
+                clip.slider.mouseChildren = false;
+                clip.slider.addEventListener(MouseEvent.MOUSE_DOWN,sdownHandler);
+                clip.slider.addEventListener(MouseEvent.MOUSE_OVER,soverHandler);
+                clip.slider.addEventListener(MouseEvent.MOUSE_OUT,soutHandler);
                 clip.visible = false;
-                trace(clip);
         };
 
@@ -119 +119 @@
                 var idx = evt.data.index;
                 if(!isNaN(active)) {
-                        buttons[active].c.gotoAndStop('out');
-                }
-                buttons[idx].c.gotoAndStop('active');
+                        buttons[active].c.gotoAndPlay('out');
+                }
+                buttons[idx].c.gotoAndPlay('active');
                 active = idx;
         };
@@ -136 +136 @@
         private function overHandler(evt:MouseEvent) {
                 var idx = Number(evt.target.name);
-                buttons[idx].c.gotoAndStop('over');
+                buttons[idx].c.gotoAndPlay('over');
         };
 
@@ -144 +144 @@
                 var idx = Number(evt.target.name);
                 if(idx == active) {
-                        buttons[idx].c.gotoAndStop('active');
+                        buttons[idx].c.gotoAndPlay('active');
                 } else { 
-                        buttons[idx].c.gotoAndStop('out');
+                        buttons[idx].c.gotoAndPlay('out');
                 }
         };
@@ -176 +176 @@
                 } else if (view.config['playlist'] == 'over') {
                         clip.x = clip.y = 0;
-                        clip.back.height = evt.data.height;
                         clip.back.width = evt.data.width;
+                        if(proportion > 1) {
+                                clip.back.height = evt.data.height;
+                        } else if(buttons) { 
+                                clip.back.height = buttons.length*buttonheight;
+                        }
                 }
                 buildList(false);
@@ -235 +239 @@
 
 
-        /** Start scrolling the playlist. **/
-        private function startHandler(evt:MouseEvent) {
+        /** Start scrolling the playlist on mousedown. **/
+        private function sdownHandler(evt:MouseEvent) {
                 clearInterval(scrollInterval);
+        clip.stage.addEventListener(MouseEvent.MOUSE_UP,supHandler);
                 scrollHandler();
                 scrollInterval = setInterval(scrollHandler,50);
         };
+
+
+        /** Revert the highlight on mouseout. **/
+        private function soutHandler(evt:MouseEvent) {
+                clip.slider.icon.gotoAndPlay('out');
+        };
+
+
+        /** Highlight the icon on rollover. **/
+        private function soverHandler(evt:MouseEvent) {
+                clip.slider.icon.gotoAndPlay('over');
+        };
+
+
+        /** Stop scrolling the playlist on mouseout. **/
+        private function supHandler(evt:MouseEvent) {
+                clearInterval(scrollInterval);
+        clip.stage.removeEventListener(MouseEvent.MOUSE_UP,supHandler);
+        };
+
 
         /** Process state changes **/
         private function stateHandler(evt:ModelEvent) {
                 if(view.config['playlist'] == 'over') {
-                        if(evt.data.newstate == ModelStates.PLAYING || evt.data.newstate == ModelStates.BUFFERING) {
-                                clip.visible = false;
+                        if(evt.data.newstate == ModelStates.PLAYING || 
+                                evt.data.newstate == ModelStates.BUFFERING) {
+                                Animations.fade(clip,0);
                         } else {
-                                clip.visible = true;
-                        }
-                }
-        };
-
-
-        /** Stop scrolling the playlist. **/
-        private function stopHandler(evt:MouseEvent) {
-                clearInterval(scrollInterval);
+                                Animations.fade(clip,1);
+                        }
+                }
         };