Version 0.6.172, bugfix...

[pettanr/clientJs.git] / 0.6.x / js / 07_audio / 02_XHTMLAudio.js

diff --git a/0.6.x/js/07_audio/02_XHTMLAudio.js b/0.6.x/js/07_audio/02_XHTMLAudio.js
index dd71bde..0a8060d 100644 (file)
--- a/0.6.x/js/07_audio/02_XHTMLAudio.js
+++ b/0.6.x/js/07_audio/02_XHTMLAudio.js
@@ -12,7 +12,6 @@ var X_Audio_HTMLAudio_playTrigger =
                // Android 2.3.5(SBM101SH) では stalled は発生しない,,,　ので必ず loadeddata もチェックする\r
                X_UA[ 'AndroidBrowser' ] ? 'stalled' :\r
                X_UA[ 'OperaMobile' ] || X_UA[ 'OperaTablet' ] ? 'loadeddata' :\r
-               //X_UA[ 'WinPhone' ] && X_UA[ 'IE9' ] ? 'canplay' :\r
                        'loadeddata', //'canplay',\r
        X_Audio_HTMLAudioWrapper,\r
        X_Audio_constructor = window[ 'Audio' ] || window.HTMLAudioElement,\r
@@ -20,7 +19,7 @@ var X_Audio_HTMLAudio_playTrigger =
        // onended イベント時に再生を継続する場合、audio.play() を呼ぶ必要がある\r
        X_Audio_HTMLAudioWrapper_needPlayOnended = !X_UA[ 'AndroidChromeBrowser' ] && X_UA[ 'AndroidBrowser' ],\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' ],\r
        // Android1.6+MobileOpera12では無理っぽい、、、\r
        X_Audio_HTMLAudioWrapper_badOperaAndroid = X_Audio_HTMLAudioWrapper_currentTimeFix && X_UA[ 'Android' ] < 2,\r
 \r
@@ -298,7 +297,7 @@ if( X_Audio_constructor && !X_Audio_HTMLAudioWrapper_badOperaAndroid ){
                                    if( this.playing ){\r
                                        end = X_AudioWrapper_getEndTime( this ) + this.shortPlayFix;\r
                                        now = this.getActualCurrentTime();\r
-                                       console.log( now + ' / ' + end );\r
+                                       //console.log( now + ' / ' + end );\r
                                        if( 0 + end <= 0 + now ){ // 0+ なぜか iem9 で必要,,,\r
                                                if( this.autoLoop ){\r
                                                        if( !( this.target[ 'dispatch' ]( X_EVENT_MEDIA_BEFORE_LOOP ) & X_CALLBACK_PREVENT_DEFAULT ) ){\r
@@ -373,7 +372,7 @@ if( X_Audio_constructor && !X_Audio_HTMLAudioWrapper_badOperaAndroid ){
                                };\r
                                \r
                                if( !loaded && type ){\r
-                                       console.log( '(2) ' + e.type + ' d:' + ( this.duration | 0 ) );\r
+                                       // console.log( '(2) ' + e.type + ' d:' + ( this.duration | 0 ) );\r
                                        this.target[ 'dispatch' ]( type );\r
                                        type === X_EVENT_ERROR && this[ 'kill' ]();\r
                                };\r
@@ -448,6 +447,8 @@ if( X_Audio_constructor && !X_Audio_HTMLAudioWrapper_badOperaAndroid ){
                        actualPause : function(){\r
                                if( !this.playing ) return;\r
                                \r
+                               console.log( '[HTMLAudio] pause' );\r
+                               \r
                                this.seekTime = this.getActualCurrentTime();\r
 \r
                                delete this._playTime;\r