OSDN Git Service
(root)
/
pettanr
/
clientJs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Version 0.6.217, add #switch for X.Audio.
[pettanr/clientJs.git]
/
0.6.x
/
js
/
07_audio
/
10_XAudioSprite.js
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
(file)
--- 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
\r
if(
\r
// WebAudio
\r
// TODO 今は touch 可能で backend ready
\r
if(
\r
// WebAudio
\r
- (
backend.backendID === 1 && ( _e[ 'needTouchForPlay' ] = X_WebAudio_need1stTouch
) ) ||
\r
+ (
e[ 'needTouchForPlay' ] && ( _e[ 'needTouchForPlay' ] = true
) ) ||
\r
// HTMLAudio
\r
// HTMLAudio
\r
- (
backend.backendID === 2 && ( _e[ 'needTouchForLoad' ] = X_HTMLAudio_need1stTouch
) )
\r
+ (
e[ 'needTouchForLoad' ] && ( _e[ 'needTouchForLoad' ] = true
) )
\r
){
\r
X_AudioSprite_TEMP.event = _e;
\r
){
\r
X_AudioSprite_TEMP.event = _e;
\r
- last[ 'listenOnce' ]( X_EVENT_MEDIA_
TOUCH_FOR_LOAD
, X_AudioSprite_backendHandler );
\r
+ last[ 'listenOnce' ]( X_EVENT_MEDIA_
WAIT_FOR_TOUCH
, X_AudioSprite_backendHandler );
\r
} else {
\r
X_AudioSprite[ 'asyncDispatch' ]( _e );
\r
};
\r
} else {
\r
X_AudioSprite[ 'asyncDispatch' ]( _e );
\r
};
\r
@@
-386,8
+386,8
@@
function X_AudioSprite_backendHandler( e ){
[ 'asyncDispatch' ]( X_EVENT_BACKEND_NONE );
\r
return X_CALLBACK_STOP_NOW;
\r
\r
[ 'asyncDispatch' ]( X_EVENT_BACKEND_NONE );
\r
return X_CALLBACK_STOP_NOW;
\r
\r
- case X_EVENT_MEDIA_
TOUCH_FOR_LOAD
:
\r
- // TODO 全ての track の MEDIA_
TOUCH_FOR_LOAD
で!
\r
+ case X_EVENT_MEDIA_
WAIT_FOR_TOUCH
:
\r
+ // TODO 全ての track の MEDIA_
WAIT_FOR_TOUCH
で!
\r
X_AudioSprite[ 'asyncDispatch' ]( X_AudioSprite_TEMP.event );
\r
delete X_AudioSprite_TEMP.event;
\r
break;
\r
X_AudioSprite[ 'asyncDispatch' ]( X_AudioSprite_TEMP.event );
\r
delete X_AudioSprite_TEMP.event;
\r
break;
\r