X-Git-Url: http://git.osdn.jp/view?p=pettanr%2FclientJs.git;a=blobdiff_plain;f=0.6.x%2Fjs%2F07_audio%2F10_XAudioSprite.js;fp=0.6.x%2Fjs%2F07_audio%2F10_XAudioSprite.js;h=f0183bca73edb3e1767cc459e1f70300e049ab29;hp=bb4272b1ebd559f5603ab4734f39839b9bee5e12;hb=4e4ab3be10850546063d4a4b93250ed142bb8cd2;hpb=b05bf97c1b3b1720e73af54017a48291a364d394 diff --git a/0.6.x/js/07_audio/10_XAudioSprite.js b/0.6.x/js/07_audio/10_XAudioSprite.js index bb4272b..f0183bc 100644 --- a/0.6.x/js/07_audio/10_XAudioSprite.js +++ b/0.6.x/js/07_audio/10_XAudioSprite.js @@ -365,12 +365,12 @@ function X_AudioSprite_backendHandler( e ){ // TODO 今は touch 可能で backend ready if( // WebAudio - ( backend.backendID === 1 && ( _e[ 'needTouchForPlay' ] = X_WebAudio_need1stTouch ) ) || + ( e[ 'needTouchForPlay' ] && ( _e[ 'needTouchForPlay' ] = true ) ) || // HTMLAudio - ( backend.backendID === 2 && ( _e[ 'needTouchForLoad' ] = X_HTMLAudio_need1stTouch ) ) + ( e[ 'needTouchForLoad' ] && ( _e[ 'needTouchForLoad' ] = true ) ) ){ X_AudioSprite_TEMP.event = _e; - last[ 'listenOnce' ]( X_EVENT_MEDIA_TOUCH_FOR_LOAD, X_AudioSprite_backendHandler ); + last[ 'listenOnce' ]( X_EVENT_MEDIA_WAIT_FOR_TOUCH, X_AudioSprite_backendHandler ); } else { X_AudioSprite[ 'asyncDispatch' ]( _e ); }; @@ -386,8 +386,8 @@ function X_AudioSprite_backendHandler( e ){ [ 'asyncDispatch' ]( X_EVENT_BACKEND_NONE ); return X_CALLBACK_STOP_NOW; - case X_EVENT_MEDIA_TOUCH_FOR_LOAD : - // TODO 全ての track の MEDIA_TOUCH_FOR_LOAD で! + case X_EVENT_MEDIA_WAIT_FOR_TOUCH : + // TODO 全ての track の MEDIA_WAIT_FOR_TOUCH で! X_AudioSprite[ 'asyncDispatch' ]( X_AudioSprite_TEMP.event ); delete X_AudioSprite_TEMP.event; break;