X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=0.6.x%2Fjs%2F07_audio%2F10_XAudioSprite.js;h=cd91dc4fb654b567fdb0ec3d46cca57e306fac52;hb=527f50d3e1930a335a6525b5c973ab27fe385868;hp=23ff7e5e230901225428cce321f36c23d0a592ee;hpb=34431df46635079c1ce6626c9caf1456f88e91bd;p=pettanr%2FclientJs.git diff --git a/0.6.x/js/07_audio/10_XAudioSprite.js b/0.6.x/js/07_audio/10_XAudioSprite.js index 23ff7e5..cd91dc4 100644 --- a/0.6.x/js/07_audio/10_XAudioSprite.js +++ b/0.6.x/js/07_audio/10_XAudioSprite.js @@ -8,10 +8,8 @@ var X_AudioSprite_shouldUse = X_HTMLAudio && ( X_UA[ 'iOS' ] || X_UA[ 'AO X_AudioSprite_useVideoForMulti = //( 3.1 <= X_UA[ 'AOSP' ] < 4 ) || //( ( 4.2 <= X_UA[ 'AOSP' ] ), // ドスパラパッドはビデオのインライン再生が不可 - false, //X_UA[ 'ChromeWV' ], - X_AudioSprite_needTouchAndroid = X_UA[ 'ChromeWV' ] && !X_WebAudio, - X_AudioSprite_needTouchFirst = X_HTMLAudio_need1stTouch, - X_AudioSprite_disableMultiTrack = ( X_UA[ 'iOS' ] && !X_WebAudio_context ) || ( X_UA[ 'AOSP4' ] ) || ( X_UA[ 'WinPhone' ] && X_UA[ 'IE' ] < 12 ), + false, + X_AudioSprite_disableMultiTrack = !X_WebAudio && ( X_UA[ 'iOS' ] || 4 <= X_UA[ 'AOSP' ] || X_UA[ 'ChromeWV' ] || ( X_UA[ 'WinPhone' ] && X_UA[ 'IE9' ] ) ), X_AudioSprite_enableVolume = X_HTMLAudio && ( !X_UA[ 'iOS' ] && !X_UA[ 'AOSP' ] && !X_UA[ 'OperaMobile' ] && !X_UA[ 'OperaTablet' ] ), // TODO fennec は 25以上 // http://tukumemo.com/html5-audio-sp/ // iOS6、Android4.1から同時再生が可能になりました。 @@ -110,7 +108,6 @@ X[ 'AudioSprite' ] = function( setting ){ }; X[ 'AudioSprite' ][ 'shouldUse' ] = X_AudioSprite_shouldUse; -X[ 'AudioSprite' ][ 'needTouchFirst' ] = X_AudioSprite_needTouchFirst; X[ 'AudioSprite' ][ 'enableMultiTrack' ] = !X_AudioSprite_disableMultiTrack; // 再生が終わっているもの、終わりかけのものを探す @@ -146,22 +143,14 @@ X_AudioSprite_members = /** * モバイル用タッチイベント中に呼び出す */ - 'load' : function(){ - var tracks = X_AudioSprite_TEMP.tracks, - i = 0, l = tracks.length; + 'on1stTouch' : function(){ + var i = 0, l = X_AudioSprite_TEMP.tracks.length; for( ; i < l; ++i ){ - if( X_AudioSprite_needTouchAndroid ){ - console.log( '[duration fix]開始 - ' + tracks[ i ][ '_rawObject' ].duration ); - tracks[ i ]._durationFixPhase = 1; - tracks[ i ][ '_rawObject' ].play(); - } else - if( X_UA[ 'WinPhone' ] ){ - console.log( 'WinPhone : touch -> play()' ); - //tracks[ i ].play( 0, X_AudioSprite_lengthSilence, true, 0, X_AudioSprite_lengthSilence ).seek( 0 ); - this[ 'pause' ]( i ); + if( X_UA[ 'iOS' ] ){ + X_AudioSprite_TEMP.tracks[ i ][ '_rawObject' ].load(); } else { - tracks[ i ][ '_rawObject' ].load(); + X_AudioSprite_instance[ 'pause' ]( i ); }; }; }, @@ -199,7 +188,7 @@ X_AudioSprite_members = track = X_AudioSprite_TEMP.bgmTrack = tracks[ 0 ]; }; - if( track[ 'listen' ]( [ X_EVENT_MEDIA_PLAYING, X_EVENT_MEDIA_WAITING, X_EVENT_MEDIA_SEEKING, X_EVENT_MEDIA_BEFORE_LOOP ], this, X_AudioSprite_handleEvent ).playing ){ + if( track[ 'listen' ]( [ X_EVENT_MEDIA_PLAYING, X_EVENT_MEDIA_WAITING, X_EVENT_MEDIA_SEEKING, X_EVENT_MEDIA_BEFORE_LOOP ], X_AudioSprite_instance, X_AudioSprite_handleEvent ).playing ){ track.setState({ 'loop' : true, 'looped' : X_AudioSprite_TEMP.bgmLooped, @@ -219,7 +208,7 @@ X_AudioSprite_members = if( 1 < tracks.length ){ track = X_AudioSprite_getTrackEnded( X_AudioSprite_TEMP.bgmPlaying ); track - [ 'listen' ]( [ X_EVENT_MEDIA_PLAYING, X_EVENT_MEDIA_WAITING, X_EVENT_MEDIA_SEEKING, X_EVENT_MEDIA_BEFORE_LOOP ], this, X_AudioSprite_handleEvent ) + [ 'listen' ]( [ X_EVENT_MEDIA_PLAYING, X_EVENT_MEDIA_WAITING, X_EVENT_MEDIA_SEEKING, X_EVENT_MEDIA_BEFORE_LOOP ], X_AudioSprite_instance, X_AudioSprite_handleEvent ) .setState( { 'looped' : false } ); track.play( preset[ 0 ], preset[ 1 ], true, 0, X_AudioSprite_lengthSilence ); } else { @@ -231,7 +220,7 @@ X_AudioSprite_members = }; track = tracks[ 0 ]; - if( track[ 'listen' ]( [ X_EVENT_MEDIA_PLAYING, X_EVENT_MEDIA_WAITING, X_EVENT_MEDIA_SEEKING, X_EVENT_MEDIA_BEFORE_LOOP ], this, X_AudioSprite_handleEvent ).playing ){ + if( track[ 'listen' ]( [ X_EVENT_MEDIA_PLAYING, X_EVENT_MEDIA_WAITING, X_EVENT_MEDIA_SEEKING, X_EVENT_MEDIA_BEFORE_LOOP ], X_AudioSprite_instance, X_AudioSprite_handleEvent ).playing ){ track.setState({ 'loop' : true, 'looped' : false, @@ -267,8 +256,8 @@ X_AudioSprite_members = }; track && track.play( 0, X_AudioSprite_lengthSilence, true, 0, X_AudioSprite_lengthSilence ); track && track.seek( 0 ); - this[ 'asyncDispatch' ]( X_EVENT_MEDIA_PAUSED ); - return this; + X_AudioSprite_instance[ 'asyncDispatch' ]( X_EVENT_MEDIA_PAUSED ); + return X_AudioSprite_instance; }, /** @@ -286,7 +275,7 @@ X_AudioSprite_members = start = X_Audio_getStartTime( track, end ); 0 <= position && position <= ( end - start ) && track.seek( start + position ); }; - return this; + return X_AudioSprite_instance; }, /** @@ -305,14 +294,14 @@ X_AudioSprite_members = for( i = X_AudioSprite_TEMP.tracks.length; i; ){ X_AudioSprite_TEMP.tracks[ --i ].volume( opt_volume ); }; - return this; + return X_AudioSprite_instance; }; track = X_AudioSprite_TEMP.tracks[ uid ]; if( opt_volume === undefined ){ return track ? track.gain : -1; }; track && track.volume( opt_volume ); - return this; + return X_AudioSprite_instance; }, /** @@ -340,12 +329,12 @@ X_AudioSprite_members = return { 'volume' : X_AudioSprite_TEMP.volume, 'playing' : false }; }; track && track.setState( opt_obj ); - return this; + return X_AudioSprite_instance; } }; function X_AudioSprite_backendHandler( e ){ - var i, backend, option, src, name, last, _e; + var i, backend, option, src, name, last, _e, touch; switch( e.type ){ case X_EVENT_BACKEND_READY : @@ -353,9 +342,9 @@ function X_AudioSprite_backendHandler( e ){ backend = X_Audio_BACKENDS[ e[ 'backendID' ] ]; option = e[ 'option' ]; - this[ 'unlisten' ]( X_EVENT_BACKEND_NONE, X_AudioSprite_backendHandler ); - this[ 'source' ] = src = e[ 'source' ]; - this[ 'backendName' ] = name = backend.backendName; + X_AudioSprite_instance[ 'unlisten' ]( X_EVENT_BACKEND_NONE, X_AudioSprite_backendHandler ); + X_AudioSprite_instance[ 'source' ] = src = e[ 'source' ]; + X_AudioSprite_instance[ 'backendName' ] = name = backend.backendName; //console.log( i + ' / ' + X_AudioSprite_numTracks ); @@ -365,11 +354,7 @@ function X_AudioSprite_backendHandler( e ){ console.log( 'use video' ); }; // Audiobackend の owner として null を渡すとAudioBackend 自身へ dispatch する - X_AudioSprite_TEMP.tracks.push( last = backend.klass( null, e[ 'source' ], option ) ); - - - //console.dir( backend ); - //console.dir( last ); + X_AudioSprite_TEMP.tracks.push( last = backend.klass( null, e[ 'source' ], option )[ 'listen' ]( X_EVENT_DEBUG, X_AudioSprite_instance, X_AudioSprite_handleEvent ) ); }; _e = { @@ -377,45 +362,39 @@ function X_AudioSprite_backendHandler( e ){ 'source' : src, 'backendName' : name }; + // touch 可能で backend ready - if( X_AudioSprite_needTouchFirst ){ - if( name === 'WebAudio' ){ - _e[ 'needTouchForPlay' ] = true; - } else { - _e[ 'needTouchForLoad' ] = true; - }; + if( name === 'WebAudio' ){ + _e[ 'needTouchForPlay' ] = touch = X_WebAudio_need1stTouch; + } else + if( name === 'HTMLAudio' ){ + _e[ 'needTouchForLoad' ] = touch = X_HTMLAudio_need1stTouch; }; - this[ 'asyncDispatch' ]( _e ); + + X_AudioSprite_instance[ 'asyncDispatch' ]( _e ); console.log( 'AudioSprite - X_EVENT_BACKEND_READY' ); - last[ 'listenOnce' ]( X_EVENT_READY, this, X_AudioSprite_backendHandler ); + last[ 'listenOnce' ]( touch && !X_HTMLAudio_durationFix ? X_EVENT_MEDIA_PLAYING : X_EVENT_READY, X_AudioSprite_instance, X_AudioSprite_backendHandler ); // READY, needTouchForPlay, needTouchForLoad - if( X_HTMLAudio_durationFix && !X_AudioSprite_needTouchFirst ){ + if( /* X_HTMLAudio_durationFix && */ !touch ){ for( i = 0; i < X_AudioSprite_TEMP.tracks.length; ++i ){ - this[ 'pause' ]( i ); + X_AudioSprite_instance[ 'pause' ]( i ); }; }; return X_CALLBACK_STOP_NOW; case X_EVENT_BACKEND_NONE : - this[ 'unlisten' ]( X_EVENT_BACKEND_READY, this, X_AudioSprite_backendHandler ) + X_AudioSprite_instance[ 'unlisten' ]( X_EVENT_BACKEND_READY, X_AudioSprite_instance, X_AudioSprite_backendHandler ) [ 'asyncDispatch' ]( X_EVENT_BACKEND_NONE ); return X_CALLBACK_STOP_NOW; - case X_EVENT_READY : - if( X_AudioSprite_needTouchAndroid ){ - for( i = 0; i < X_AudioSprite_TEMP.tracks.length; ++i ){ - this[ 'pause' ]( i ); - }; - e.target[ 'listenOnce' ]( X_EVENT_MEDIA_PLAYING, this, this[ 'asyncDispatch' ], [ X_EVENT_READY ] ); - return; - }; - + case X_EVENT_READY : + case X_EVENT_MEDIA_PLAYING : console.log( 'X.AudioSprite - Ready!' ); - this[ 'asyncDispatch' ]( X_EVENT_READY ); + X_AudioSprite_instance[ 'asyncDispatch' ]( X_EVENT_READY ); break; }; }; @@ -426,22 +405,22 @@ function X_AudioSprite_handleEvent( e ){ switch( e.type ){ case X_EVENT_MEDIA_PLAYING : - ( e.target === X_AudioSprite_TEMP.bgmTrack || !e.target.looped ) && this[ 'asyncDispatch' ]( X_EVENT_MEDIA_PLAYING ); + ( e.target === X_AudioSprite_TEMP.bgmTrack || !e.target.looped ) && X_AudioSprite_instance[ 'asyncDispatch' ]( X_EVENT_MEDIA_PLAYING ); break; case X_EVENT_MEDIA_WAITING : case X_EVENT_MEDIA_SEEKING : - ( e.target === X_AudioSprite_TEMP.bgmTrack || !e.target.looped ) && this[ 'asyncDispatch' ]( e.type ); + ( e.target === X_AudioSprite_TEMP.bgmTrack || !e.target.looped ) && X_AudioSprite_instance[ 'asyncDispatch' ]( e.type ); break; case X_EVENT_MEDIA_BEFORE_LOOP : if( e.target === X_AudioSprite_TEMP.bgmTrack ){ X_AudioSprite_TEMP.bgmLooped = true; - this[ 'asyncDispatch' ]( X_EVENT_MEDIA_LOOPED ); // TODO uid + X_AudioSprite_instance[ 'asyncDispatch' ]( X_EVENT_MEDIA_LOOPED ); // TODO uid } else { if( e.target.looped ){ - //this[ 'asyncDispatch' ]( X_EVENT_MEDIA_LOOPED ); // TODO uid + // X_AudioSprite_instance[ 'asyncDispatch' ]( X_EVENT_MEDIA_LOOPED ); // TODO uid } else { - this[ 'asyncDispatch' ]( X_EVENT_MEDIA_ENDED ); // TODO uid + X_AudioSprite_instance[ 'asyncDispatch' ]( X_EVENT_MEDIA_ENDED ); // TODO uid }; //console.log( '[AudioSprite] bgmPlaying:' + X_AudioSprite_TEMP.bgmPlaying + ' ' + !X_AudioSprite_TEMP.bgmTrack ); @@ -449,12 +428,21 @@ function X_AudioSprite_handleEvent( e ){ // single track | iOS if( X_AudioSprite_TEMP.bgmPlaying && !X_AudioSprite_TEMP.bgmTrack ){ X_AudioSprite_TEMP.bgmTrack = e.target; - this.play( X_AudioSprite_TEMP.bgmName ); + X_AudioSprite_instance.play( X_AudioSprite_TEMP.bgmName ); return X_CALLBACK_PREVENT_DEFAULT; }; }; break; + + case X_EVENT_DEBUG : + i = X_AudioSprite_TEMP.tracks.indexOf( e.target ); + if( 0 <= i ){ + e[ 'trackID' ] = i; + X_AudioSprite_instance[ 'dispatch' ]( e ); + }; + break; + // TODO Android Firefox で アクティブ検出できない！ case X_EVENT_VIEW_ACTIVATE : console.log( '■ アクティブ' ); @@ -493,7 +481,7 @@ function X_AudioSprite_handleEvent( e ){ X_AudioSprite_TEMP.bgmLooped = false; X_AudioSprite_TEMP.bgmPlaying = false; - X_ViewPort[ 'unlisten' ]( [ X_EVENT_VIEW_ACTIVATE, X_EVENT_VIEW_DEACTIVATE ], this, X_AudioSprite_handleEvent ); + X_ViewPort[ 'unlisten' ]( [ X_EVENT_VIEW_ACTIVATE, X_EVENT_VIEW_DEACTIVATE ], X_AudioSprite_instance, X_AudioSprite_handleEvent ); break; }; };