Changeset 87c08fa30db304b89c0e17a2c94909af0474fc0e

Timestamp:

03/06/11 16:06:12 (15 months ago)

Author:

Robin Gareus <robin@…>

Parents:

eb719711269312a77b89ba047aa0ea803a4c68d9

Children:

0f973c08b964db1275e3a7379cd46660a974b7dd

git-committer:

Robin Gareus <robin@gareus.org> / 2011-03-06T17:06:12Z+0100

Message:

sansarmes: VU meter, translate comments, etc

Files:

• flex/sansarmes/main.mxml (modified) (18 diffs)

flex/sansarmes/main.mxml

@@ -37 +37 @@
             private var password:String;
             private var username:String;
-            private var accepted_license:Boolean;
 
             // sound
@@ -47 +46 @@
             private var nc:NetConnection;
             private var ns:NetStream;
+
+            // Mic VU meter
+            private var myVu:Shape;
+            private var vutimer:Timer;
 
             private function onAppInit():void
@@ -56 +59 @@
                 username="4dc84c9279d0fcaa793eecfbc544cdbe7ea5f6e4";
                 password="f78b64c9e0f2ea24fddce2b0d809cb2855fed1a6";
-                accepted_license=false;
                 uploadName=null;
               
@@ -72 +74 @@
                     tt.enabled=false;
                     Alert.show('You do need a camera for live streaming.\nPlease connect one and then reload this Page.',
-                               'No camera detected', mx.controls.Alert.OK);
+                               'No camera detected', mx.controls.Alert.OK); // XXX translate
                     return;
                 }
@@ -90 +92 @@
                     , 'Camera Info', mx.controls.Alert.OK);
               */
-
+              // VU
+                vutimer = new Timer(120);
+                vutimer.addEventListener(TimerEvent.TIMER, vuTimerHandler);
+                myVu=new Shape();
+                myVu.graphics.clear();
+                vucanvas.rawChildren.addChild(myVu); 
             }
 
@@ -119 +126 @@
                 if (soundChannel) soundChannel.stop();
                 soundProgress.visible = false;
+                vubox.visible = false;
+                vutimer.stop();
+                myVu.graphics.clear();
             } 
             
@@ -143 +153 @@
             }
 
-            private function onTacFault(event:FaultEvent):void
-            {
-                Alert.show('HTTP error:\n'+event.toString(),'Alert.', mx.controls.Alert.OK);
-                br.selected=false;
-            }
-            
             private function startConnection():void
             {
@@ -179 +183 @@
                 stream.attachCamera(cam);
                 stream.attachAudio(mic);
+                vubox.visible = true;
+                vutimer.start();
                 stream.publish(uploadName, "record");   
             }
@@ -192 +198 @@
             public function camBt(event:Event):void {
                 if(bc.selected) {
-
-                    if (!accepted_license) {
-                      ask_license();
-                      return;
-                    }
-
                     bp.enabled=false;
                     bu.enabled=false;
@@ -206 +206 @@
                     br.enabled=true;
                     video.attachCamera(cam);
+                    // TODO: check if cam access is accepted!
                     bc.label="arrêter la caméra";
                 } else {
@@ -240 +241 @@
                     case "NetStream.Play.StreamNotFound":
                         Alert.show('error:\n'+event.info.code, 'Alert.', mx.controls.Alert.OK);
-                        break;
+                        bu.enabled=false;
+                        bp.enabled=false;
                     case "NetStream.Play.Stop":                
                         bp.selected=false;
@@ -246 +248 @@
                         break;
                     default:                    
-                        Alert.show('debug:\n'+event.info.code, 'Alert.', mx.controls.Alert.OK);
+                        //Alert.show('debug:\n'+event.info.code, 'Alert.', mx.controls.Alert.OK);
                         break;
                 }
@@ -252 +254 @@
 
             public function playBt(event:Event):void {
-                // todo: check uploadName etc
-                // todo: disconnect camera, re-enable 
 
                 bc.selected=false;
@@ -275 +275 @@
                 br.enabled=false;
 
+                if (!uploadName) return; // XXX error? NO: BUG :)
+
                 nc = new NetConnection();
                 nc.connect(null);
                 ns = new NetStream(nc);
                 ns.addEventListener(NetStatusEvent.NET_STATUS, playStatusHandler);
-                ns.play("http://tac1.theartcollider.org/sansarmes/data/"+uploadName+".flv"); /// XXX
+                ns.play("http://tac1.theartcollider.org/sansarmes/data/"+uploadName+".flv");
                 video.mx_internal::videoPlayer.attachNetStream(ns);
                 video.mx_internal::videoPlayer.visible = true;
-
-                // TODO: on end -> re-enable buttons like stop
             }
 
             private function onPubOK(event:ResultEvent):void {
                 Alert.show('Your video entered the moderation queue and will be published after review, soon.',
-                           'Published.', mx.controls.Alert.OK);
+                           'Published.', mx.controls.Alert.OK); // XXX translate
                 bu.enabled = false;
             }
@@ -294 +294 @@
             private function onPubFault(event:FaultEvent):void {
                 Alert.show('Publication failed. please contact robin.gareus@citu.info',
-                           'Publication Failed.', mx.controls.Alert.OK);
+                           'Publication Failed.', mx.controls.Alert.OK); // XXX translate
                 bu.enabled = false;
-            }
-
-            public function pubBt(event:Event):void {
-                service.send({file:uploadName});
             }
 
             private function license_choise(eventObj:CloseEvent):void {
                 if (eventObj.detail==Alert.YES) {
-                    accepted_license=true;
-                    camBt(null);
-                } else {
-                  bc.selected=false;
+                    service.send({file:uploadName});
                 }
             }
 
             private function ask_license():void {
+                //if (!uploadName) return; // XXX error? NO: BUG :)
                 var myAlert:Alert;
                 myAlert = Alert.show("J'autorise la diffusion de cette vidéo (si toutefois je la valide) dans le cadre du projet \"Sans Armes Citoyens\", et notamment sur le site web d'Arte Creative et dans les présentations publiques de ce site et du projet. Les auteurs et Arte Creative s'engagent à ne pas rendre publique ou utiliser à d'autres fins les coordonnées du participant.",
@@ -325 +319 @@
                 bc.enabled=true;
             }
+
+            // VU meter
+            private function vuTimerHandler(event:TimerEvent):void{
+                var vol:int = mic.activityLevel;
+                var color:int = 0xFF0000;
+                if (vol<1) vol=1;
+                if (vol>99) vol=100;
+                if (vol<10)      color=0x0000FF;
+                else if (vol>85) color=0xFF0000;
+                else if (vol>70) color=0xFFFF00;
+                else             color=0x00FF00;
+                myVu.graphics.clear();          
+                myVu.graphics.beginFill(0x000000);
+                myVu.graphics.drawRect(0, 0, 260, 16);            
+                myVu.graphics.beginFill(color);
+                myVu.graphics.drawRect(1, 1, vol*2.58, 14);            
+                myVu.graphics.endFill();
+            }
+
         ]]>
     </mx:Script>
@@ -404 +417 @@
             <mx:VideoDisplay id="video" width="340" height="240" />
             <mx:ProgressBar width="340" mode="manual" label="%3%%" labelPlacement="center" visible="false" id="soundProgress"/>
+            <mx:Box direction="horizontal" visible="false" id="vubox" width="340"> 
+                <mx:Label width="70" text="Micro:" />
+                <mx:Canvas id="vucanvas" width="260" height="16"/>
+            </mx:Box>
             <mx:Spacer height="100%"/>
+
+
             <mx:Text width="340">
                 <mx:htmlText>
@@ -413 +432 @@
             <mx:Text width="340">
                 <mx:htmlText>
-                    <![CDATA[<b>étape 6</b>: valider l'enregistrement pour publication]]>
-                </mx:htmlText>
-            </mx:Text>
-            <mx:Button id="bu" click="pubBt(event)" label="publier"/>
+                    <![CDATA[<b>étape 6</b>: valider et autoriser l'enregistrement pour publication]]>
+                </mx:htmlText>
+            </mx:Text>
+            <mx:Button id="bu" click="ask_license()" label="publier"/>
         </mx:VBox>
     </mx:Box>