}\r
};\r
\r
-var X_Audio_BACKENDS = [];\r
+var X_Audio_BACKENDS = [],\r
+ X_Audio_WRAPPER_LIST = [];\r
\r
/*\r
* TODO preplayerror play してみたら error が出た、backend の変更。\r
};\r
};\r
\r
+function X_AudioProxy_getAudioWrapper( proxy ){\r
+ var i = X_Audio_WRAPPER_LIST.length;\r
+ for( ; i; ){\r
+ if( X_Audio_WRAPPER_LIST[ --i ].proxy === proxy ) return X_Audio_WRAPPER_LIST[ i ];\r
+ };\r
+};\r
\r
var X_AudioProxy = X.EventDispatcher.inherits(\r
'X.AV.AudioProxy',\r
},\r
\r
close : function(){\r
- return this._backend !== -1 && X_Audio_BACKENDS[ this._backend ].close( this );\r
+ return this._backend !== -1 && X_AudioProxy_getAudioWrapper( this ).close();\r
},\r
\r
- play : function( startTime, endTime, loop, loopStartTime ){\r
+ play : function( startTime, endTime, loop, loopStartTime, loopEndTime ){\r
var state, duration;\r
- if( startTime ){\r
+ if( 0 <= startTime ){\r
this.state( {\r
+ currentTime : startTime,\r
startTime : startTime,\r
endTime : endTime,\r
loop : loop,\r
- loopStartTime : loopStartTime\r
+ loopStartTime : loopStartTime,\r
+ loopEndTime : loopEndTime\r
} );\r
};\r
- this._backend !== -1 && X_Audio_BACKENDS[ this._backend ].play( this );\r
+ this._backend !== -1 && X_AudioProxy_getAudioWrapper( this ).play();\r
return this;\r
},\r
\r
seek : function( seekTime ){\r
- var state = this.state();\r
- if( state.playing ){\r
- seekTime < state.endTime && this.state( { currentTime : seekTime } );\r
- } else {\r
- this.state( { startTime : seekTime } );\r
+ var state = this.state(),\r
+ end = X_AudioWrapper_getEndTime( X_AudioProxy_getAudioWrapper( this ) );\r
+ if( seekTime < end ){\r
+ this.state( { currentTime : seekTime } );\r
};\r
return this;\r
},\r
\r
pause : function(){\r
- this.state().playing && X_Audio_BACKENDS[ this._backend ].pause( this );\r
+ this.state().playing && X_AudioProxy_getAudioWrapper( this ).pause();\r
return this;\r
},\r
\r
state : function( obj ){\r
- var backend = this._backend !== -1 && X_Audio_BACKENDS[ this._backend ];\r
+ var backend = this._backend !== -1 && X_AudioProxy_getAudioWrapper( this );\r
\r
if( obj === undefined ){\r
return backend ?\r
- backend.state( this ) :\r
+ backend.state() :\r
{\r
startTime : -1,\r
endTime : -1,\r
loopStartTime : -1,\r
+ loopEndTime : -1,\r
currentTime : -1,\r
loop : false,\r
- loaded : false,\r
+ looded : false,\r
error : false,\r
playing : false,\r
\r
duration : 0\r
};\r
};\r
- backend && backend.state( this, obj );\r
+ backend && backend.state( obj );\r
return this;\r
}, \r
\r
loop : function( v ){\r
- var backend = this._backend !== -1 && X_Audio_BACKENDS[ this._backend ];\r
+ var backend = this._backend !== -1 && X_AudioProxy_getAudioWrapper( this );\r
if( v === undefined ){\r
- return backend && backend.state( this ).loop;\r
+ return backend && backend.state().loop;\r
};\r
- backend && backend.state( this, { loop : v } );\r
+ backend && backend.state( { loop : v } );\r
return this;\r
},\r
\r
volume : function( v ){\r
- var backend = this._backend !== -1 && X_Audio_BACKENDS[ this._backend ];\r
+ var backend = this._backend !== -1 && X_AudioProxy_getAudioWrapper( this );\r
if( v === undefined ){\r
- return backend && backend.state( this ).volume;\r
+ return backend && backend.state().volume;\r
};\r
- backend && backend.state( this, { volume : v } );\r
+ backend && backend.state( { volume : v } );\r
return this;\r
},\r
\r
currentTime : function( v ){\r
- var backend = this._backend !== -1 && X_Audio_BACKENDS[ this._backend ];\r
+ var backend = this._backend !== -1 && X_AudioProxy_getAudioWrapper( this );\r
if( v === undefined ){\r
- return backend && backend.state( this ).currentTime;\r
+ return backend && backend.state().currentTime;\r
};\r
- backend && backend.state( this, { currentTime : v } );\r
+ backend && backend.state( { currentTime : v } );\r
return this;\r
},\r
\r
isPlaying : function(){\r
- return this._backend !== -1 && X_Audio_BACKENDS[ this._backend ].state( this ).playing;\r
+ return this._backend !== -1 && X_AudioProxy_getAudioWrapper( this ).state().playing;\r
}\r
\r
}\r
this.unlisten( 'nobackend', X_AudioProxy_handleEvent );\r
this.source = e.source;\r
this.backendName = X_Audio_BACKENDS[ this._backend ].backendName;\r
- X_Audio_BACKENDS[ this._backend ].register( this, e.source, e.option );\r
+ X_Audio_WRAPPER_LIST.push( new X_Audio_BACKENDS[ this._backend ].klass( this, e.source, e.option ) );\r
break;\r
\r
case 'nobackend' :\r
audioWrapper.seekTime = v;\r
seek = 2;\r
};\r
- break;\r
- }; \r
+ } else {\r
+ audioWrapper.seekTime = v;\r
+ };\r
} else {\r
continue;\r
};\r
- k = 'startTime';\r
+ break;\r
\r
case 'startTime' :\r
case 'endTime' :\r
case 'loopStartTime' :\r
+ case 'loopEndTime' :\r
v = X_AudioWrapper_timeStringToNumber( v );\r
- if( X.Type.isNumber( v ) && audioWrapper[ k ] !== v ){\r
- audioWrapper[ k ] = v;\r
- // 再生中の endTime, currentTime の変更\r
- if( playing && k === 'endTime' ) end = 1;\r
+ console.log( k + ' ' + v );\r
+ if( v || v === 0 ){\r
+ if( audioWrapper[ k ] !== v ){\r
+ audioWrapper[ k ] = v;\r
+ \r
+ // 再生中の endTime の変更\r
+ if( playing && ( k === 'endTime' || k === 'loopEndTime' ) ) end = 1; \r
+ };\r
+ } else {\r
+ delete audioWrapper[ k ];\r
+ if( playing && ( k === 'endTime' || k === 'loopEndTime' ) ) end = 1;\r
};\r
break;\r
\r
case 'loop' :\r
+ case 'looped' :\r
if( X.Type.isBoolean( v ) && audioWrapper[ k ] !== v ){\r
audioWrapper[ k ] = v;\r
};\r
};\r
};\r
\r
- if( audioWrapper.endTime <= audioWrapper.startTime ||\r
- audioWrapper.endTime <= audioWrapper.loopStartTime ||\r
- audioWrapper.endTime < audioWrapper.seekTime ||\r
- audioWrapper.duration < audioWrapper.endTime\r
+ if( audioWrapper.endTime < audioWrapper.startTime ||\r
+ ( audioWrapper.loopEndTime < 0 ? audioWrapper.endTime : audioWrapper.loopEndTime ) < ( audioWrapper.loopStartTime < 0 ? audioWrapper.startTime : audioWrapper.loopStartTime ) ||\r
+ X_AudioWrapper_getEndTime( audioWrapper ) < audioWrapper.seekTime// ||\r
+ //audioWrapper.duration < audioWrapper.endTime\r
){\r
//alert( 'error @updateStateObject() begin:' + audioWrapper.startTime + ' end:' + audioWrapper.endTime + ' d:' + audioWrapper.duration + ' ls:' + audioWrapper.loopStartTime );\r
return 0;\r
ms = ( h * 3600 + m * 60 + s ) * 1000 + ms;\r
return ms < 0 ? 0 : ms;\r
};\r
+\r
+function X_AudioWrapper_getStartTime( audioWrapper, endTime, delSeekTime ){\r
+ var seek = audioWrapper.seekTime;\r
+ if( delSeekTime ) delete audioWrapper.seekTime;\r
+ \r
+ if( 0 <= seek ){\r
+ if( audioWrapper.duration <= seek || endTime < seek ) return 0;\r
+ return seek;\r
+ };\r
+ \r
+ if( audioWrapper.looped && 0 <= audioWrapper.loopStartTime ){\r
+ if( audioWrapper.duration <= audioWrapper.loopStartTime || endTime < audioWrapper.loopStartTime ) return 0;\r
+ return audioWrapper.loopStartTime;\r
+ };\r
+ \r
+ if( audioWrapper.startTime < 0 || audioWrapper.duration <= audioWrapper.startTime ) return 0;\r
+ return audioWrapper.startTime;\r
+};\r
+\r
+function X_AudioWrapper_getEndTime( audioWrapper ){\r
+ var duration = audioWrapper.duration;\r
+ \r
+ if( audioWrapper.looped && 0 <= audioWrapper.loopEndTime ){\r
+ if( duration <= audioWrapper.loopEndTime ) return duration;\r
+ return audioWrapper.loopEndTime;\r
+ };\r
+ \r
+ if( audioWrapper.endTime < 0 || duration <= audioWrapper.endTime ) return duration;\r
+ return audioWrapper.endTime;\r
+};\r
+\r
OSDN Git Service
