* SilverlLight5 ie6&7(ietester,winxp), ie8(winxp) で動作確認。firefox32 では動作しない。(4以下の方がよい？)\r
*/\r
\r
-var X_Audio_SLAudio, X_Audio_SLAudioWrapper,\r
- X_Audio_SLAudio_uid = 0,\r
- X_Audio_SLAudio_LIVE_LIST = [],\r
- X_Audio_SLAudio_POOL_LIST = [];\r
+var X_Audio_SLAudioWrapper,\r
+ X_Audio_SLAudio_uid = 0;\r
\r
if( X.Pulgin.SilverlightEnabled ){\r
\r
- function getSLAudioWrapper( proxy ){\r
- var i = X_Audio_SLAudio_LIVE_LIST.length;\r
- for( ; i; ){\r
- if( X_Audio_SLAudio_LIVE_LIST[ --i ].proxy === proxy ) return X_Audio_SLAudio_LIVE_LIST[ i ];\r
- };\r
- };\r
- \r
- X_Audio_SLAudio = \r
- {\r
- backendName : 'Silverlight Audio',\r
-\r
- detect : function( proxy, source, ext ){\r
- var ok = ext === 'mp3' || ext === 'wma';\r
- proxy.asyncDispatch( ok ? 'support' : 'nosupport' ); \r
- },\r
- \r
- register : function( proxy, source, option ){\r
- X_Audio_SLAudio_LIVE_LIST.push( new X_Audio_SLAudioWrapper( proxy, source, option ) );\r
- },\r
- \r
- close : function( proxy ){\r
- return getSLAudioWrapper( proxy ).close();\r
- },\r
- \r
- play : function( proxy ){\r
- return getSLAudioWrapper( proxy ).play();\r
- },\r
- \r
- pause : function( proxy ){\r
- return getSLAudioWrapper( proxy ).pause();\r
- },\r
- \r
- state : function( proxy, obj ){\r
- return getSLAudioWrapper( proxy ).state( obj );\r
- }\r
- };\r
- \r
- X_Audio_BACKENDS.push( X_Audio_SLAudio );\r
- \r
- function slerror(){\r
- alert( 'slerror' );\r
- };\r
- \r
+ // X.Node.inherits はできない。_rawObject は <object> でなく silverlight\r
X_Audio_SLAudioWrapper = X.EventDispatcher.inherits(\r
'X.AV.SilverlightAudioWrapper',\r
X.Class.POOL_OBJECT,\r
{\r
- _isSilverlight : true, // for X.EventDispatcher.listen\r
+ '_rawType' : X_EventDispatcher_EVENT_TARGET_TYPE.SILVER_LIGHT,\r
proxy : null,\r
\r
startTime : 0,\r
- endTime : 0,\r
- loopStartTime : 0,\r
- seekTime : 0,\r
+ endTime : -1,\r
+ loopStartTime : -1,\r
+ loopEndTime : -1,\r
+ seekTime : -1,\r
duration : 0,\r
\r
playing : false,\r
error : 0, \r
loop : false,\r
+ looped : false,\r
+ autoplay : false,\r
volume : 0.5,\r
\r
_onload : '',\r
\r
if( !X_Audio_SLAudio_uid ){\r
// source\r
- //X.X_Node_systemNode.create( 'script', { type : 'text/xaml', id : 'silverlightaudio' } )\r
+ // X_Node_systemNode.create( 'script', { type : 'text/xaml', id : 'silverlightaudio' } )\r
// .text( '<Canvas xmlns="http://schemas.microsoft.com/client/2007" ' +\r
// 'xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"></Canvas>');\r
\r
// TODO embed\r
this.proxy = proxy;\r
this._source = source;\r
+ // X.Audio._slOnload_ は不可\r
this._onload = 'XAudioSilverlightOnLoad' + ( ++X_Audio_SLAudio_uid );\r
- this._callback = window[ this._onload ] = X_Callback_create( this, this.onSLReady, [ option.autoplay ] );\r
+ this._callback = window[ this._onload ] = X_Callback_create( this, this.onSLReady );\r
this.xnodeObject = X_Node_body\r
.create( 'object', {\r
type : 'application/x-silverlight-2',\r
this.listenOnce( X.Event.KILL_INSTANCE );\r
},\r
\r
- onSLReady : function( sender, autoplay ){\r
+ onSLReady : function( sender ){\r
if( !this._onload ) return;\r
\r
window[ this._onload ] = null;\r
'</Canvas>'));\r
\r
this._rawObject = sender.findName('media'); // x:Name='media'\r
- \r
+\r
this.listen( [ 'MediaFailed', 'MediaOpened', 'MediaEnded', 'CurrentStateChanged' ] );\r
- \r
- autoplay && X.Timer.once( 100, this, this.play );\r
},\r
\r
handleEvent : function( e ){\r
var lastState, currentState;\r
\r
+ console.log( e.type );\r
switch( e.type ){\r
\r
case 'MediaFailed' :\r
this.playing = false;\r
this._ended = true;\r
this._paused = false;\r
- this.proxy.dispatch( 'error' ); // open failed\r
+ this.proxy.dispatch( X.Event.ERROR ); // open failed\r
break;\r
\r
case 'MediaOpened' :\r
// http://msdn.microsoft.com/ja-jp/library/bb979710(VS.95).aspx\r
this.duration = this._rawObject.NaturalDuration.Seconds * 1000;\r
- this.endTime = this.endTime || this.duration;\r
// TODO 'canplaythrough'\r
- this.proxy.asyncDispatch( 'loadstart' );\r
- this.proxy.asyncDispatch( 'loadedmetadata' );\r
- this.proxy.asyncDispatch( 'loadeddata' );\r
- this.proxy.asyncDispatch( 'canplay' );\r
- this.proxy.asyncDispatch( 'canplaythrough' );\r
+ //this.proxy.asyncDispatch( 'loadstart' );\r
+ //this.proxy.asyncDispatch( 'loadedmetadata' );\r
+ //this.proxy.asyncDispatch( 'loadeddata' );\r
+ //this.proxy.asyncDispatch( 'canplay' );\r
+ //this.proxy.asyncDispatch( 'canplaythrough' );\r
+ this.proxy.asyncDispatch( X.Event.READY );\r
+ \r
+ this.autoplay && X.Timer.once( 16, this, this.play );\r
break;\r
\r
case 'MediaEnded' : \r
case 'Opening' :\r
switch( this._lastUserAction ){\r
case 'play' :\r
- this.proxy.dispatch( 'waiting' );\r
+ this.proxy.dispatch( X.Event.MEDIA_WAITING );\r
break;\r
case 'seek' :\r
- this.proxy.dispatch( 'seeking' );\r
+ this.proxy.dispatch( X.Event.MEDIA_SEEKING );\r
break;\r
case 'pause' :\r
break;\r
// media.play(file not found) -> 'Closed'\r
// media.load -> 'Error'\r
case 'Error':\r
- case 'Closed':\r
this.error = 4;\r
+ case 'Closed':\r
+ this.error = this.error || 2;\r
this.playing = false;\r
this._ended = true;\r
this._paused = false;\r
- this.proxy.dispatch( 'error' );\r
+ this.proxy.dispatch( X.Event.ERROR );\r
break;\r
\r
// userAction.pause() -> MediaState('Paused') -> x\r
switch( this._lastUserAction ){\r
case 'play': // play() -> file end -> event('ended')\r
case 'seek':\r
- this._ended = true;\r
- this._paused = false;\r
- this.proxy.dispatch( 'ended' );\r
+ this.seekTime = 0;\r
+ this._ended = true;\r
+ this._paused = false;\r
+ this.proxy.dispatch( X.Event.MEDIA_ENDED );\r
this._currentTime( this.startTime );\r
break;\r
case 'pause':\r
this.playing = true;\r
this._ended = false;\r
this._paused = false;\r
- this.proxy.dispatch( 'playing' );\r
+ this.proxy.dispatch( X.Event.MEDIA_PLAYING );\r
break;\r
\r
// stop()\r
case X.Event.KILL_INSTANCE :\r
if( this._onload ){\r
// window への delete に ie5 は対応しないが、そもそも ie5 は Silverlight に非対応\r
- delete window[ this._onload ];\r
+ window[ this._onload ] = null;\r
delete this._onload;\r
X_Callback_correct( this._callback );\r
};\r
\r
close : function(){\r
this.playing && this.pause();\r
- this.proxy.dispatch( 'ended' );\r
+ this.proxy.dispatch( X.Event.MEDIA_ENDED );\r
this.kill();\r
},\r
\r
// SilverlightAudio.play\r
- play : function( seekTime ){\r
- var begin, halfway;\r
+ play : function(){\r
+ var begin, end;\r
\r
// もし kill 後に autoplayTimer で呼ばれても、_closed==true なので平気\r
if( this.error ) return;\r
-\r
- begin = ( seekTime || seekTime === 0 ) ? seekTime : this.playing ? this.loopStartTime : this.startTime;\r
- this._lastUserAction = this.playing ? 'seek' : 'play';\r
+ if( !this.duration ){\r
+ this.autoplay = true;\r
+ return;\r
+ };\r
+ \r
+ this._lastUserAction = 0 <= this.seekTime ? 'seek' : 'play';\r
+ \r
+ end = X_AudioWrapper_getEndTime( this );\r
+ begin = X_AudioWrapper_getStartTime( this, end, true ) | 0;\r
+ \r
+ console.log( '[SLAudio] play ' + begin + ' -> ' + end );\r
\r
- this._currentTime( begin );\r
this._rawObject.Volume = this.volume;\r
+ this._beginTime = begin;\r
+ this._currentTime( begin );\r
\r
if( !this.playing ){\r
this._rawObject.play();\r
- this.proxy.dispatch( 'play' );\r
+ //this.proxy.dispatch( 'play' );\r
\r
this.playing = true;\r
};\r
\r
- halfway = this.endTime < this.duration;\r
this._timerID && X.Timer.remove( this._timerID );\r
\r
- if( halfway ){\r
- this._timerID = X.Timer.once( this.endTime - begin, this, this._onEnded );\r
+ if( end < this.duration ){\r
+ this._timerID = X.Timer.once( end - begin, this, this._onEnded );\r
} else {\r
delete this._timerID;\r
};\r
delete this._interval;\r
return X_Callback_UN_LISTEN;\r
};\r
- this.proxy.dispatch( 'timeupdate' );\r
+ this.proxy.dispatch( X.Event.MEDIA_PLAYING );\r
},\r
\r
_onEnded : function(){\r
+ var time, end;\r
delete this._timerID;\r
+ \r
if( this.playing ){\r
+ console.log( '> end ' + X_AudioWrapper_getEndTime( this ) + ' current:' + ( this._rawObject.Position.Seconds * 1000 | 0 ) );\r
+ time = this._rawObject.Position.Seconds * 1000 | 0;\r
+ \r
+ if( time <= this._beginTime ){\r
+ console.log( '== waiting' );\r
+ this.proxy.dispatch( X.Event.MEDIA_WAITING );\r
+ this._timerID = X.Timer.once( X_AudioWrapper_getEndTime( this ) - this._beginTime, this, this._onEnded );\r
+ return;\r
+ };\r
+ \r
+ time -= X_AudioWrapper_getEndTime( this );\r
+ if( time < 0 ){\r
+ console.log( '> onEnd ' + time );\r
+ this._timerID = X.Timer.once( -time, this, this._onEnded );\r
+ return;\r
+ };\r
+ \r
if( this.loop ){\r
- this.play();\r
+ if( !( this.proxy.dispatch( X.Event.MEDIA_BEFORE_LOOP ) & X.Callback.PREVENT_DEFAULT ) ){\r
+ this.looped = true;\r
+ this.proxy.dispatch( X.Event.MEDIA_LOOPED );\r
+ this.play();\r
+ };\r
} else {\r
this.pause();\r
- this.dispatch( 'ended' ); \r
+ this.proxy.dispatch( X.Event.MEDIA_ENDED );\r
};\r
};\r
},\r
\r
// SilverlightAudio.pause\r
pause : function(){\r
- if( !this.error ){\r
- this._lastUserAction = 'pause';\r
- this.playing = false;\r
- this._paused = true;\r
- this._ended = false;\r
- this._rawObject.pause();\r
- this.proxy.dispatch( 'pause' );\r
- };\r
+ if( this.error || !this.playing ) return;\r
+ \r
+ this._lastUserAction = 'pause';\r
+ this.seekTime = this.state().currentTime;\r
+ this.playing = false;\r
+ this._paused = true;\r
+ this._ended = false;\r
+ \r
+ this._rawObject.pause();\r
+ //this.proxy.dispatch( 'pause' );\r
},\r
\r
// SilverlightAudio.state\r
state : function( obj ){ // @return Hash: { loop, error, paused, ended, source, duration }\r
- var result;\r
+ var result, end;\r
\r
if( obj === undefined ){\r
return {\r
startTime : this.startTime,\r
- endTime : this.endTime,\r
- loopStartTime : this.loopStartTime,\r
- currentTime : this._rawObject.Position.Seconds * 1000,\r
+ endTime : this.endTime < 0 ? this.duration : this.endTime,\r
+ loopStartTime : this.loopStartTime < 0 ? this.startTime : this.loopStartTime,\r
+ loopEndTime : this.loopEndTime < 0 ? ( this.endTime || this.duration ) : this.loopEndTime,\r
+ \r
+ // 整数化 しておかないと seek 時に不具合がある。\r
+ currentTime : this.playing ? this._rawObject.Position.Seconds * 1000 | 0 : this.seekTime,\r
+\r
loop : this.loop,\r
+ looped : this.looped,\r
volume : this.volume,\r
error : this.error,\r
playing : this.playing,\r
- duration : this.duration || 0 // this._rawObject.NaturalDuration.Seconds;\r
+ duration : this.duration // this._rawObject.NaturalDuration.Seconds;\r
};\r
};\r
\r
result = X_AudioWrapper_updateStates( this, obj );\r
\r
if( result & 2 ){ // seek\r
- this.play( this.seekTime );\r
- delete this.seekTime;\r
+ this.play();\r
} else {\r
if( result & 1 ){\r
- halfway = this.endTime < this.duration;\r
+ end = X_AudioWrapper_getEndTime( this );\r
+ halfway = end < this.duration;\r
this._timerID && X.Timer.remove( this._timerID );\r
\r
if( halfway ){\r
- this._timerID = X.Timer.once( this.endTime - this._rawObject.Position.Seconds * 1000, this, this._onEnded );\r
+ this._timerID = X.Timer.once( end - this._rawObject.Position.Seconds * 1000 | 0, this, this._onEnded );\r
} else {\r
delete this._timerID;\r
};\r
_currentTime : function( time ){ // @param Number: time\r
var position = this._rawObject.Position; // [!] create instance\r
\r
- position.Seconds = time / 1000; // set current time\r
+ position.Seconds = time / 1000 | 0; // set current time\r
\r
this._rawObject.Position = position; // [!] reattach instance\r
}\r
\r
}\r
);\r
- \r
-};\r
\r
+ function slerror(){\r
+ alert( 'slerror' );\r
+ };\r
+\r
+ X_Audio_BACKENDS.push( {\r
+ backendName : 'Silverlight Audio',\r
\r
+ detect : function( proxy, source, ext ){\r
+ var ok = ext === 'mp3' || ext === 'wma' || ext === 'wav';\r
+ proxy.asyncDispatch( ok ? X_Audio_CAN_PLAY : X_Audio_NOT_PLAY ); \r
+ },\r
+ \r
+ klass : X_Audio_SLAudioWrapper\r
+ \r
+ } );\r
\r
+};
\ No newline at end of file
OSDN Git Service
