Version 0.6.217, add #switch for X.Audio.

[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 17ea8ab..1c88ae5 100644 (file)
--- a/0.6.x/js/07_audio/02_XHTMLAudio.js
+++ b/0.6.x/js/07_audio/02_XHTMLAudio.js
@@ -177,11 +177,11 @@ if( X_Audio_constructor ){
                                if( X_HTMLAudio_need1stTouch ){\r
                                        raw.src = source;\r
                                } else {\r
-                                       // if( this.autoplay ){\r
+                                       if( this.autoplay ){\r
                                                raw.preload  = 'auto';\r
                                                raw.autoplay = true; // Android 4.0-4.1.x で必要\r
                                                //raw.autobuffer = true;\r
-                                       //};\r
+                                       };\r
                                        raw.src = source;\r
                                        raw.load(); // Android4.1.1 HTL21 では必要!\r
                                };\r
@@ -379,7 +379,7 @@ if( X_Audio_constructor ){
                                if( this._touchState === 1 ){\r
                                        if( e.type === X_HTMLAudio_playTrigger ){\r
                                                this._touchState = 2;\r
-                                               this.disatcher[ 'asyncDispatch' ]( X_EVENT_MEDIA_TOUCH_FOR_LOAD );                                              \r
+                                               this.disatcher[ 'asyncDispatch' ]( X_EVENT_MEDIA_WAIT_FOR_TOUCH );\r
                                        };\r
                                } else\r
                                if( ended ){\r
@@ -407,7 +407,7 @@ if( X_Audio_constructor ){
 \r
                        actualPlay : function( forcePlay, forceReload ){\r
                                var raw = this[ '_rawObject' ],\r
-                                       e, begin, end;\r
+                                       begin, end;\r
 \r
                                if( !raw ) return;\r
                                \r
@@ -425,11 +425,13 @@ if( X_Audio_constructor ){
                                };\r
 \r
                                if( this._touchState === 2 ){\r
-                                       e = X_EventDispatcher_CURRENT_EVENTS[ X_EventDispatcher_CURRENT_EVENTS.length - 1 ];\r
+                                       //@dev{\r
+                                       var e = X_EventDispatcher_CURRENT_EVENTS[ X_EventDispatcher_CURRENT_EVENTS.length - 1 ];\r
                                        if( !e || !e[ 'pointerType' ] ){\r
                                                alert( 'タッチイベント以外での play! ' + ( e ? e.type : '' ) );\r
                                                return;\r
                                        };\r
+                                       //@}\r
                                        this._touchState = 3;\r
                                } else\r
                                if( this._readyState !== 3 && this._durationFixPhase < 2 ){\r
@@ -578,7 +580,9 @@ if( X_Audio_constructor ){
                 *  - volume, muted iPhone(iOS4-6)、Android(2.3.6)では動作せず。\r
                 *  - FireFox3.6, Android 2.3.6については、src変更後、load()を呼び出さないと切り替わらなかった。iPhoneはload()が不要。\r
                 */     \r
-                       detect : function( proxy, source, ext ){\r
+                       detect : function( proxy, ext, hash ){\r
+                       // TODO hash.CBR\r
+                       // 得意度で返す\r
                                proxy[ 'asyncDispatch' ]( { type : X_EVENT_COMPLETE, canPlay : X_Audio_codecs[ ext ] } );\r
                        },\r
                        \r