OSDN Git Service

Version 0.6.180, fix X.Audio.
[pettanr/clientJs.git] / 0.6.x / js / 07_audio / 02_XHTMLAudio.js
index 61f3ddd..10a5bfd 100644 (file)
@@ -16,8 +16,7 @@
  * \r
  * memo\r
  * 1. AOSP4.1 iframe 内の Audio は親に focus が移っても再生を継続する\r
- * 2. AOSP4.2(Genymotion) どこかのタイミングでタッチによる play を行う\r
- * 3. AOSP oggはシークが乱れる m4a, mp3 は優秀\r
+ * 2. AOSP oggはシークが乱れる m4a, mp3 は優秀\r
  */\r
        /*\r
         * durationFix\r
         *        -> opera11、10.54 WinXP はまとも、、、 portable が怪しい??\r
         */\r
 \r
-var X_HTMLAudio_playTrigger =\r
-               X_UA[ 'iOS' ] < 5    ? 'stalled' :\r
-               X_UA[ 'iOS' ] < 6    ? 'suspend' :\r
-               X_UA[ 'iOS' ] < 7    ? 'suspend' :\r
-               X_UA[ 'iOS' ]        ? 'loadeddata' :\r
-               X_UA[ 'Safari' ] < 4 ? 'canplaythrough' :\r
-               X_UA[ 'ChromeWV' ]   ? 'canplaythrough' :\r
-               // Android 2.3.5(SBM101SH) では stalled は発生しない,,, ので必ず loadeddata もチェックする\r
-               //X_UA[ 'AOSP' ] < 3 ? 'stalled' :\r
-               //X_UA[ 'AOSP' ] ? 'playing' :\r
-               X_UA[ 'OperaMobile' ] || X_UA[ 'OperaTablet' ] ? 'loadeddata' :\r
-                       'loadeddata', //'canplay',\r
+var\r
        X_HTMLAudio,\r
        \r
        // ended が発生しない timeupdate 内で play() を呼ぶ (未検証) 不具合確認は iOS4,6\r
@@ -58,7 +46,7 @@ var X_HTMLAudio_playTrigger =
        // ended 時に play() を実施, currentTime が duration に張り付き更新されなければ  src='';src=src を実施。\r
        X_HTMLAudio_endedFixAOSP4   = 4 <= X_UA[ 'AOSP' ],\r
        // ended 時に play() を実施\r
-       X_HTMLAudio_endedFixCWV     = X_UA[ 'ChromeWV' ],\r
+       X_HTMLAudio_endedFixCWV     = X_UA[ 'ChromeWV' ] || ( X_UA[ 'Blink' ] && X_UA[ 'Android' ] ),\r
        \r
        // Opera Mobile 12 は 2回目以降の currentTime へのセットで currentTime が更新されなくなるため、タイマーを使用する\r
        X_HTMLAudio_currentTimeFix  = !!X_UA[ 'OperaMobile' ] || !!X_UA[ 'OperaTablet' ],\r
@@ -73,12 +61,13 @@ var X_HTMLAudio_playTrigger =
        // \r
        X_HTMLAudio_pauseFix            = ( X_UA[ 'Windows' ] && 12 <= X_UA[ 'Opera' ] && 0 < ' XP XPSP2 2003|XP64'.indexOf( X_UA[ 'Windows' ] ) ), // XP + Opera12 のみ?\r
 \r
-       X_HTMLAudio_need1stTouch        = X_UA[ 'iOS' ] || 4 <= X_UA[ 'AOSP' ] || X_UA[ 'ChromeWV' ] || X_UA[ 'WinPhone' ],     \r
-       X_HTMLAudio_durationFix     = X_UA[ 'iOS' ] || X_UA[ 'ChromeWV' ] || ( X_UA[ 'Windows' ] && 12 <= X_UA[ 'Opera' ] ) || ( X_UA[ 'WinPhone' ] && X_UA[ 'IE9' ] ),\r
+       X_HTMLAudio_need1stTouch        = X_UA[ 'iOS' ] || 4 <= X_UA[ 'AOSP' ] || X_UA[ 'ChromeWV' ] || X_UA[ 'WinPhone' ] || ( X_UA[ 'Blink' ] && X_UA[ 'Android' ] ),\r
        \r
-       X_HTMLAudio_shortPlayFix        = X_UA[ 'AOSP' ]; // Android 4.1.1 でも遭遇\r
+       X_HTMLAudio_playTrigger     = ( X_UA[ 'WinPhone' ] && X_UA[ 'IE9' ] ) ? 'canplay' : X_UA[ 'iOS' ] ? 'suspend' : X_UA[ 'Blink' ] ? 'stalled' : 'canplaythrough',\r
        \r
+       X_HTMLAudio_durationFix     = X_UA[ 'iOS' ] || X_UA[ 'ChromeWV' ] || ( X_UA[ 'Windows' ] && 12 <= X_UA[ 'Opera' ] ) || ( X_UA[ 'WinPhone' ] && X_UA[ 'IE9' ] ),\r
        \r
+       X_HTMLAudio_shortPlayFix        = X_UA[ 'AOSP' ]; // Android 4.1.1 でも遭遇\r
 \r
 if( X_Audio_constructor ){\r
        \r
@@ -91,6 +80,9 @@ if( X_Audio_constructor ){
                        _ready            : false,              \r
                        _src                      : '',\r
                        \r
+                       _touchRequested   : false,\r
+                       _touched          : false,\r
+                       \r
                        _currentFixStart  : 0,\r
                        _currentFixBegin  : 0,\r
 \r
@@ -176,7 +168,7 @@ if( X_Audio_constructor ){
                                var raw    = this[ '_rawObject' ],\r
                                        actualEnded = e.type === 'ended',\r
                                        ended       = actualEnded,\r
-                                       ready       = e.type === X_HTMLAudio_playTrigger,\r
+                                       ready,\r
                                        eventType, duration, end, now;\r
                                \r
                                // global に公開\r
@@ -210,6 +202,7 @@ if( X_Audio_constructor ){
                                                break;\r
                                        \r
                                        case 'loadeddata' :      //     コンテンツの表示を現在の再生位置で初めて行えるようになった場合に発生\r
+                                       case 'canplaythrough' : //      今すぐに再生を開始してもバッファリングで停止することなく最後まで表示できると予測している場合に発生\r
                                                if( !this._endedFixON ){\r
                                                        ready = true;\r
                                                };\r
@@ -220,7 +213,6 @@ if( X_Audio_constructor ){
                                                        raw.play();\r
                                                        raw.currentTime = 0; // 必要!\r
                                                };\r
-                                       case 'canplaythrough' : //      今すぐに再生を開始してもバッファリングで停止することなく最後まで表示できると予測している場合に発生\r
                                                if( this._endedFixON ){\r
                                                        console.log( '▽ onEndedFix の終了 @' + e.type  );\r
                                                        this._endedFixON = false;\r
@@ -228,7 +220,7 @@ if( X_Audio_constructor ){
                                                };\r
                                        case 'loadedmetadata' : //      ブラウザがメディアリソースの長さと寸法を判定した場合に発生\r
                                        case 'durationchange' : //  duration属性が更新された場合に発生\r
-                                               if( !this.duration ){\r
+                                               if( !this.duration || this.duration !== raw.duration * 1000 ){ // Blink28 duration が変わる\r
                                                        duration = raw.duration;\r
                                                };\r
                                                break;\r
@@ -328,7 +320,13 @@ if( X_Audio_constructor ){
 \r
                                this._loaded  = this._loaded || ready;\r
 \r
-                               // \r
+                               //\r
+                               if( X_HTMLAudio_need1stTouch && !this._touchRequested ){\r
+                                       if( e.type === X_HTMLAudio_playTrigger ){\r
+                                               this._touchRequested = true;\r
+                                               this.disatcher[ 'asyncDispatch' ]( X_EVENT_MEDIA_CAN_TOUCH_LOAD );                                              \r
+                                       };\r
+                               } else\r
                                if( ended ){\r
                                        if( !this._closed && this.autoLoop ){\r
                                                if( !( this.disatcher[ 'dispatch' ]( X_EVENT_MEDIA_BEFORE_LOOP ) & X_CALLBACK_PREVENT_DEFAULT ) ){\r
@@ -359,7 +357,7 @@ if( X_Audio_constructor ){
 \r
                        actualPlay : function( forcePlay, forceReload ){\r
                                var raw = this[ '_rawObject' ],\r
-                                       begin, end;\r
+                                       e, begin, end;\r
                                \r
                                // もし kill 後に autoplayTimer で呼ばれても、_closed==true なので平気\r
                                if( this._closed ) return;\r
@@ -371,6 +369,14 @@ if( X_Audio_constructor ){
                                        //return;\r
                                };                              \r
                                \r
+                               if( this._touchRequested && !this._touched ){\r
+                                       e = X_EventDispatcher_CURRENT_EVENTS[ X_EventDispatcher_CURRENT_EVENTS.length - 1 ];\r
+                                       if( !e || !e[ 'pointerType' ] ){\r
+                                               alert( 'タッチイベント以外での play! ' + e.type );\r
+                                               return;\r
+                                       };\r
+                                       this._touched = true;\r
+                               } else\r
                                if( !this._ready && ( !X_HTMLAudio_durationFix || !X_HTMLAudio_need1stTouch ) ){\r
                                        this.autoplay = true;\r
                                        return;\r
@@ -412,8 +418,11 @@ if( X_Audio_constructor ){
                                        \r
                                        //http://himaxoff.blog111.fc2.com/blog-entry-97.html\r
                                        //Firefox3.6では一度も play() していない状態で currentTime = 0 を実行するとエラーになる。\r
-                                       //また、GoogleChrome7 では currentTime = 0 直後に play() すると、pause()した位置前後の音が混ざることがある。(少なくとも自分の環境では)                                                                        \r
-                                       raw.currentTime = this._lastCurrentTime;\r
+                                       //また、GoogleChrome7 では currentTime = 0 直後に play() すると、pause()した位置前後の音が混ざることがある。(少なくとも自分の環境では)\r
+\r
+                                       // iOS で duration が 0 の時に触ると error\r
+                                       if( !X_HTMLAudio_durationFix || this.duration ) raw.currentTime = this._lastCurrentTime;\r
+\r
                                        console.log( '[HTMLAudio] play ' + begin + ' -> ' + end + ' crt:' + ( raw.currentTime | 0 ) + ' last:' + this._lastCurrentTime );\r
 \r
                                        if( forceReload || ( X_HTMLAudio_endedFixAOSP4 && raw.duration && raw.currentTime === raw.duration ) ){\r