OSDN Git Service

Version 0.6.133, fix for closure compiler - ADVANCED_OPTIMIZATIONS
[pettanr/clientJs.git] / 0.6.x / js / 07_audio / 02_XHTMLAudio.js
index df0024b..396a246 100644 (file)
@@ -5,18 +5,18 @@
  */\r
 \r
 var X_Audio_HTMLAudio_playTrigger =\r
-               6 <= X_UA.iOS ? 'loadeddata' :\r
-               X_UA.iOS ? 'suspend' :\r
-               X_UA.AndroidBrowser2 ? 'stalled' : // Android 2.3.5(SBM101SH) では stalled は発生しない,,,\r
-               X_UA.AndroidBrowser4 ? 'loadeddata' : \r
-               X_UA.OperaMobile || X_UA.OperaTablet ? 'loadeddata' : 'canplay',\r
+               6 <= X_UA[ 'iOS' ] ? 'loadeddata' :\r
+               X_UA[ 'iOS' ] ? 'suspend' :\r
+               X_UA[ 'AndroidBrowser2' ] ? 'stalled' : // Android 2.3.5(SBM101SH) では stalled は発生しない,,,\r
+               X_UA[ 'AndroidBrowser4' ] ? 'loadeddata' : \r
+               X_UA[ 'OperaMobile' ] || X_UA[ 'OperaTablet' ] ? 'loadeddata' : 'canplay',\r
        X_Audio_HTMLAudioWrapper,\r
        X_Audio_constructor = window.Audio || window.HTMLAudioElement,\r
        X_Audio_rawAudio,\r
        // Opera Mobile 12 android4.4.4 & 2.3.5 は 2回目以降の currentTime へのセットで currentTime が更新されなくなるため、タイマーを使用する\r
-       X_Audio_HTMLAudioWrapper_currentTimeFix  = !!X_UA.OperaMobile || !!X_UA.OperaTablet, // || ( X_UA.WinPhone && X_UA.IE9 ),\r
+       X_Audio_HTMLAudioWrapper_currentTimeFix  = !!X_UA[ 'OperaMobile' ] || !!X_UA[ 'OperaTablet' ], // || ( X_UA[ 'WinPhone' ] && X_UA[ 'IE9' ] ),\r
        // Android1.6+MobileOpera12では無理っぽい、、、\r
-       X_Audio_HTMLAudioWrapper_badOperaAndroid = X_Audio_HTMLAudioWrapper_currentTimeFix && X_UA.Android < 2,\r
+       X_Audio_HTMLAudioWrapper_badOperaAndroid = X_Audio_HTMLAudioWrapper_currentTimeFix && X_UA[ 'Android' ] < 2,\r
 \r
        // 一方 Desktop の Opera12 は、loadeddata 等では duration が infinity で、再生後の durationchange 時に duration が判明する。\r
        // opera12 volume, mute の変更が2度目以降できない\r
@@ -26,10 +26,10 @@ var X_Audio_HTMLAudio_playTrigger =
        // Opera12.17 Win32(XP) portable apps は勝手に再生が始まる、、、その際には timeupdate が発行されない、、、 iframe+image+audio で使わないときは破棄する、とか。\r
        // opera11、10.54 WinXP はまとも、、、\r
        // X_Audio_Sprite_handleEvent でも使用\r
-       X_Audio_HTMLAudioWrapper_ieMobile9Fix    = ( X_UA.WinPhone && X_UA.IE9 ),\r
-       X_Audio_HTMLAudioWrapper_durationFix     = ( !X_Audio_HTMLAudioWrapper_currentTimeFix && 12 <= X_UA.Opera ),\r
+       X_Audio_HTMLAudioWrapper_ieMobile9Fix    = ( X_UA[ 'WinPhone' ] && X_UA[ 'IE9' ] ),\r
+       X_Audio_HTMLAudioWrapper_durationFix     = ( !X_Audio_HTMLAudioWrapper_currentTimeFix && 12 <= X_UA[ 'Opera' ] ),\r
        \r
-       X_Audio_HTMLAudioWrapper_shortPlayFix    = !!X_UA.AndroidBrowser4,\r
+       X_Audio_HTMLAudioWrapper_shortPlayFix    = !!X_UA[ 'AndroidBrowser4' ],\r
        \r
        X_Audio_codecs;\r
 \r
@@ -60,13 +60,13 @@ if( X_Audio_constructor && !X_Audio_HTMLAudioWrapper_badOperaAndroid ){
        } else {\r
                // iOS3.2.3\r
                X_Audio_codecs = {\r
-             mp3  : X_UA.IE || X_UA.Chrome || ( X_UA.Windows && X_UA.Safari ),\r
-             ogg  : 5 <= X_UA.Gecko || X_UA.Chrome || X_UA.Opera,\r
-             wav  : X_UA.Gecko || X_UA.Opera || ( X_UA.Windows && X_UA.Safari ),\r
-             aac  : X_UA.IE || X_UA.WebKit,\r
-             m4a  : X_UA.IE || X_UA.WebKit,\r
-             mp4  : X_UA.IE || X_UA.WebKit,\r
-             weba : 2 <= X_UA.Gecko || 10.6 <= X_UA.Opera // firefox4+(Gecko2+)\r
+             mp3  : X_UA[ 'IE' ] || X_UA[ 'Chrome' ] || ( X_UA[ 'Windows' ]  && X_UA[ 'Safari' ]  ),\r
+             ogg  : 5 <= X_UA[ 'Gecko' ] || X_UA[ 'Chrome' ] || X_UA[ 'Opera' ] ,\r
+             wav  : X_UA[ 'Gecko' ] || X_UA[ 'Opera' ] || ( X_UA[ 'Windows' ]  && X_UA[ 'Safari' ]  ),\r
+             aac  : X_UA[ 'IE' ] || X_UA[ 'WebKit' ],\r
+             m4a  : X_UA[ 'IE' ] || X_UA[ 'WebKit' ],\r
+             mp4  : X_UA[ 'IE' ] || X_UA[ 'WebKit' ],\r
+             weba : 2 <= X_UA[ 'Gecko' ] || 10.6 <= X_UA[ 'Opera' ] // firefox4+(Gecko2+)\r
                };\r
        };\r
        \r
@@ -148,13 +148,13 @@ if( X_Audio_constructor && !X_Audio_HTMLAudioWrapper_badOperaAndroid ){
                                        X_Audio_rawAudio = null;\r
                                };\r
 \r
-                               this.listenOnce( X.Event.KILL_INSTANCE );\r
+                               this.listenOnce( X_Event.KILL_INSTANCE );\r
                        },\r
                        \r
                        handleEvent : function( e ){\r
                                switch( e.type ){\r
 \r
-                                       case X.Event.KILL_INSTANCE :\r
+                                       case X_Event.KILL_INSTANCE :\r
                                                break;\r
                                };\r
                        },\r
@@ -202,14 +202,14 @@ if( X_Audio_constructor && !X_Audio_HTMLAudioWrapper_badOperaAndroid ){
                                                break;\r
                                                \r
                                        case 'error' :          //      コンテンツの取得実行中にエラーが発生した場合に発生\r
-                                               type = X.Event.ERROR;\r
+                                               type = X_Event.ERROR;\r
                                                break;\r
                                        \r
                                        case 'playing' :        //      再生が開始された場合に発生\r
                                                if( X_Audio_HTMLAudioWrapper_currentTimeFix ){\r
                                                        this._playTime  = X_Timer_now();\r
                                                };\r
-                                               type = X.Event.MEDIA_PLAYING;\r
+                                               type = X_Event.MEDIA_PLAYING;\r
                                        case 'play' :           //      再生が開始された。play()メソッドからの復帰後に発生する場合に発生\r
                                        case 'pause' :          //      再生が一時停止された。pauseメソッドからの復帰後に発生する場合に発生\r
                                        case 'seeked' :         //      シークがfalseに変化した場合に発生\r
@@ -219,22 +219,22 @@ if( X_Audio_constructor && !X_Audio_HTMLAudioWrapper_badOperaAndroid ){
                                                break;\r
                                                \r
                                        case 'waiting' :        //      次のフレームが利用不可のため再生を停止したが、そのフレームがやがて利用可能になると想定している場合に発生\r
-                                               type = X.Event.MEDIA_WAITING;\r
+                                               type = X_Event.MEDIA_WAITING;\r
                                        case 'seeking' :        //      シークがtrueに変化し、イベントを発生させるのに十分な時間がシーク操作にかかっている場合に発生\r
-                                               type = type || X.Event.MEDIA_SEEKING;\r
+                                               type = type || X_Event.MEDIA_SEEKING;\r
                                                if( this._playForDuration === 1 ) return;\r
                                                break;\r
                                                \r
                                        case 'ended' :\r
                                                if( !this._closed && this.loop ){\r
-                                                       if( !( this.proxy.dispatch( X.Event.MEDIA_BEFORE_LOOP ) & X.Callback.PREVENT_DEFAULT ) ){\r
+                                                       if( !( this.proxy.dispatch( X_Event.MEDIA_BEFORE_LOOP ) & X.Callback.PREVENT_DEFAULT ) ){\r
                                                                this.looped = true;\r
-                                                               this.proxy.dispatch( X.Event.MEDIA_LOOPED );\r
+                                                               this.proxy.dispatch( X_Event.MEDIA_LOOPED );\r
                                                                this.play();\r
                                                        };\r
                                                        return;\r
                                                };\r
-                                               type = X.Event.MEDIA_ENDED;\r
+                                               type = X_Event.MEDIA_ENDED;\r
                                                this.seekTime = 0;\r
                                                delete this.playing;\r
                                                break;\r
@@ -243,7 +243,7 @@ if( X_Audio_constructor && !X_Audio_HTMLAudioWrapper_badOperaAndroid ){
                                                if( X_Audio_HTMLAudioWrapper_ieMobile9Fix ){\r
                                                        if( this._playForDuration === 1 ){\r
                                                                console.log( 'tu ' + this._rawObject.duration );\r
-                                                               if( !this.duration && X.Type.isFinite( this._rawObject.duration ) ){\r
+                                                               if( !this.duration && X_Type_isFinite( this._rawObject.duration ) ){\r
                                                                        this.duration = this.duration || this._rawObject.duration * 1000;\r
                                                                        this._playForDuration = 2;\r
                                                                        \r
@@ -261,7 +261,7 @@ if( X_Audio_constructor && !X_Audio_HTMLAudioWrapper_badOperaAndroid ){
                                                        } else\r
                                                        if( this._rawObject.currentTime === this._lastCurrentTime ){\r
                                                                //this.proxy.dispatch( 'seeking' );\r
-                                                               this.proxy.dispatch( X.Event.MEDIA_WAITING );\r
+                                                               this.proxy.dispatch( X_Event.MEDIA_WAITING );\r
                                                                return;\r
                                                        };\r
                                                        this._lastCurrentTime = this._rawObject.currentTime;\r
@@ -273,21 +273,21 @@ if( X_Audio_constructor && !X_Audio_HTMLAudioWrapper_badOperaAndroid ){
                                        now = X_Audio_HTMLAudioWrapper_currentTimeFix ? X_Timer_now() - this._playTime + this._beginTime : this._rawObject.currentTime * 1000 | 0;\r
                                        if( 0 + end <= 0 + now ){ // なぜか iem9 で必要,,,\r
                                                if( this.loop ){\r
-                                                       if( !( this.proxy.dispatch( X.Event.MEDIA_BEFORE_LOOP ) & X.Callback.PREVENT_DEFAULT ) ){\r
+                                                       if( !( this.proxy.dispatch( X_Event.MEDIA_BEFORE_LOOP ) & X.Callback.PREVENT_DEFAULT ) ){\r
                                                                this.looped = true;\r
-                                                               this.proxy.dispatch( X.Event.MEDIA_LOOPED );\r
+                                                               this.proxy.dispatch( X_Event.MEDIA_LOOPED );\r
                                                                this.play();\r
                                                        };\r
                                                } else {\r
                                                        this.pause();\r
-                                                       this.proxy.dispatch( X.Event.MEDIA_ENDED );\r
+                                                       this.proxy.dispatch( X_Event.MEDIA_ENDED );\r
                                                };\r
                                                return;\r
                                        };\r
                                    } else {\r
                                        return;\r
                                    };\r
-                                   type = X.Event.MEDIA_PLAYING;\r
+                                   type = X_Event.MEDIA_PLAYING;\r
                                                break;\r
                                                \r
                                        case 'durationchange' : // duration属性が更新された場合に発生\r
@@ -296,7 +296,7 @@ if( X_Audio_constructor && !X_Audio_HTMLAudioWrapper_badOperaAndroid ){
                                                        this.duration = this._rawObject.duration * 1000;\r
                                                } else\r
                                                // Desktop Opera では Infinity, IEM9 では NaN\r
-                                               if( !this.duration && X.Type.isFinite( this._rawObject.duration ) ){\r
+                                               if( !this.duration && X_Type_isFinite( this._rawObject.duration ) ){\r
                                                        \r
                                                        //console.log( this._rawObject.duration );\r
                                                        \r
@@ -344,7 +344,7 @@ if( X_Audio_constructor && !X_Audio_HTMLAudioWrapper_badOperaAndroid ){
                                if( !this._loaded && ( loaded || e.type === X_Audio_HTMLAudio_playTrigger || e.type === 'loadeddata' ) ){\r
                                        this.autoplay && X.Timer.once( 16, this, this.play );\r
                                        this._loaded = true;\r
-                                       this.proxy.dispatch( X.Event.READY );\r
+                                       this.proxy.dispatch( X_Event.READY );\r
                                        console.log( 'Loaded! ' + e.type + ' d:' + ( this.duration | 0 ) );\r
                                        return;\r
                                };\r
@@ -395,7 +395,7 @@ if( X_Audio_constructor && !X_Audio_HTMLAudioWrapper_badOperaAndroid ){
 \r
                            \r
                            if( !this.playing ){\r
-                                   if( X_UA.Chrome ){ // [CHROME][FIX] volume TODO どの version で 修正される?\r
+                                   if( X_UA[ 'Chrome' ] ){ // [CHROME][FIX] volume TODO どの version で 修正される?\r
                                        // [!] delay\r
                                        X.Timer.once( 0, this, this._fixForChrome );\r
                                        this._rawObject.volume = 0;\r
@@ -420,7 +420,7 @@ if( X_Audio_constructor && !X_Audio_HTMLAudioWrapper_badOperaAndroid ){
                        },\r
                                \r
                                // [CHROME][FIX] volume\r
-                               _fixForChrome : X_UA.Chrome && function(){\r
+                               _fixForChrome : X_UA[ 'Chrome' ] && function(){\r
                                        !this._closed && ( this._rawObject.volume = this.volume );\r
                                },\r
                        \r
@@ -529,23 +529,23 @@ if( X_Audio_constructor && !X_Audio_HTMLAudioWrapper_badOperaAndroid ){
                                var ok, mineType = 'audio/' + ext;\r
                                switch( ext ){\r
                                        case 'mp3' :\r
-                                               ok = X_UA.IE || X_UA.Chrome || ( X_UA.Windows && X_UA.Safari );\r
+                                               ok = X_UA[ 'IE' ] || X_UA[ 'Chrome' ] || ( X_UA[ 'Windows' ]  && X_UA[ 'Safari' ]  );\r
                                                mineType = 'audio/mpeg';\r
-                                               //if( X_UA.Android && X_UA.Gecko ) mineType = '';\r
+                                               //if( X_UA[ 'Android' ] && X_UA[ 'Gecko' ] ) mineType = '';\r
                                                break;\r
                                        case 'ogg' :\r
-                                               ok = 15 <= X_UA.Gecko || X_UA.Chrome || X_UA.Opera;\r
-                                               if( X_UA.AndroidBrowser ) mineType = '';\r
+                                               ok = 15 <= X_UA[ 'Gecko' ] || X_UA[ 'Chrome' ] || X_UA[ 'Opera' ] ;\r
+                                               if( X_UA[ 'AndroidBrowser' ] ) mineType = '';\r
                                                break;\r
                                        case 'm4a' :\r
-                                               ok = X_UA.IE || X_UA.WebKit;\r
+                                               ok = X_UA[ 'IE' ] || X_UA[ 'WebKit' ];\r
                                                mineType = 'audio/mp4';\r
                                                break;\r
                                        case 'webm' :\r
-                                               ok = 2 <= X_UA.Gecko || 10.6 <= X_UA.Opera; // firefox4+(Gecko2+)\r
+                                               ok = 2 <= X_UA[ 'Gecko' ] || 10.6 <= X_UA[ 'Opera' ] ; // firefox4+(Gecko2+)\r
                                                break;\r
                                        case 'wav' :\r
-                                               ok = X_UA.Gecko || X_UA.Opera || ( X_UA.Windows && X_UA.Safari );\r
+                                               ok = X_UA[ 'Gecko' ] || X_UA[ 'Opera' ] || ( X_UA[ 'Windows' ]  && X_UA[ 'Safari' ]  );\r
                                                //mineType = 'audio/wav'; // audio/x-wav ?\r
                                                break;\r
                                        default :\r
@@ -558,9 +558,9 @@ if( X_Audio_constructor && !X_Audio_HTMLAudioWrapper_badOperaAndroid ){
                                        //console.log( 'HTML Audio ' + ok + ' ext:' + ext );\r
                                };\r
                                console.log( 'HTML Audio ' + ok + ' ext:' + ext );\r
-                               proxy.asyncDispatch( ok ? X_Audio_CAN_PLAY : X_Audio_NOT_PLAY ); */\r
+                               */\r
                                \r
-                               proxy.asyncDispatch( X_Audio_codecs[ ext ] ? X_Audio_CAN_PLAY : X_Audio_NOT_PLAY );\r
+                               proxy.asyncDispatch( { type : X_Event.COMPLETE, canPlay : X_Audio_codecs[ ext ] } );\r
                        },\r
                        \r
                        klass : X_Audio_HTMLAudioWrapper\r