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.218, Fix the bug of X.Net & X.Audio.
[pettanr/clientJs.git]
/
0.6.x
/
js
/
07_audio
/
05_XWMPAudio.js
diff --git
a/0.6.x/js/07_audio/05_XWMPAudio.js
b/0.6.x/js/07_audio/05_XWMPAudio.js
index
5ee0c80
..
cb750fb
100644
(file)
--- a/
0.6.x/js/07_audio/05_XWMPAudio.js
+++ b/
0.6.x/js/07_audio/05_XWMPAudio.js
@@
-22,8
+22,8
@@
if( X_Plugin_WMP_VERSION ){ // IETester で 6.x は不可
_seekDirection : 0,
_timerID : 0,
_seekDirection : 0,
_timerID : 0,
- 'Constructor' : function( disatcher, source, option ){
- this.dis
atcher = dis
atcher || this;
+ 'Constructor' : function( dis
p
atcher, source, option ){
+ this.dis
patcher = disp
atcher || this;
this._source = source;
if( 7 <= X_Plugin_WMP_VERSION ){
this._source = source;
if( 7 <= X_Plugin_WMP_VERSION ){
@@
-71,7
+71,7
@@
if( X_Plugin_WMP_VERSION ){ // IETester で 6.x は不可
break;
case X_EVENT_KILL_INSTANCE :
break;
case X_EVENT_KILL_INSTANCE :
- this.playing && this.disatcher[ 'dispatch' ]( X_EVENT_MEDIA_ENDED );
+ this.playing && this.dis
p
atcher[ 'dispatch' ]( X_EVENT_MEDIA_ENDED );
this.playing && this.actualPause();
this.wmp.stop();
this.xnodeObject[ 'kill' ]();
this.playing && this.actualPause();
this.wmp.stop();
this.xnodeObject[ 'kill' ]();
@@
-120,7
+120,7
@@
if( X_Plugin_WMP_VERSION ){ // IETester で 6.x は不可
progress = this.wmp[ 'BufferingProgress' ];
};
if( progress < 100 ){
progress = this.wmp[ 'BufferingProgress' ];
};
if( progress < 100 ){
- this.disatcher[ 'dispatch' ]( { type : X_EVENT_PROGRESS, 'percent' : progress } );
+ this.dis
p
atcher[ 'dispatch' ]( { type : X_EVENT_PROGRESS, 'percent' : progress } );
} else {
this._readyState = 2;
if( 7 <= X_Plugin_WMP_VERSION ){
} else {
this._readyState = 2;
if( 7 <= X_Plugin_WMP_VERSION ){
@@
-128,7
+128,7
@@
if( X_Plugin_WMP_VERSION ){ // IETester で 6.x は不可
} else {
this.duration = this.wmp[ 'Duration' ] * 1000 | 0;
};
} else {
this.duration = this.wmp[ 'Duration' ] * 1000 | 0;
};
- this.disatcher[ 'dispatch' ]( X_EVENT_READY );
+ this.dis
p
atcher[ 'dispatch' ]( X_EVENT_READY );
};
} else
// ended の判定
};
} else
// ended の判定
@@
-138,33
+138,33
@@
if( X_Plugin_WMP_VERSION ){ // IETester で 6.x は不可
// waiting
if( this._seekDirection ){
if( this._seekDirection === 1 ? ( time < this._beginTime ) : ( this._lastCurrentTime <= time ) ){
// waiting
if( this._seekDirection ){
if( this._seekDirection === 1 ? ( time < this._beginTime ) : ( this._lastCurrentTime <= time ) ){
- this.disatcher[ 'dispatch' ]( X_EVENT_MEDIA_SEEKING );
+ this.dis
p
atcher[ 'dispatch' ]( X_EVENT_MEDIA_SEEKING );
return;
};
delete this._seekDirection;
};
if( time === this._lastCurrentTime ){
return;
};
delete this._seekDirection;
};
if( time === this._lastCurrentTime ){
- this.disatcher[ 'dispatch' ]( X_EVENT_MEDIA_WAITING );
+ this.dis
p
atcher[ 'dispatch' ]( X_EVENT_MEDIA_WAITING );
return;
};
this._lastCurrentTime = time;
// ended ではない
if( time - X_Audio_getEndTime( this ) < -50 ){
return;
};
this._lastCurrentTime = time;
// ended ではない
if( time - X_Audio_getEndTime( this ) < -50 ){
- this.disatcher[ 'dispatch' ]( X_EVENT_MEDIA_PLAYING );
+ this.dis
p
atcher[ 'dispatch' ]( X_EVENT_MEDIA_PLAYING );
return;
};
// ended
if( this.autoLoop ){
return;
};
// ended
if( this.autoLoop ){
- if( !( this.disatcher[ 'dispatch' ]( X_EVENT_MEDIA_BEFORE_LOOP ) & X_CALLBACK_PREVENT_DEFAULT ) ){
+ if( !( this.dis
p
atcher[ 'dispatch' ]( X_EVENT_MEDIA_BEFORE_LOOP ) & X_CALLBACK_PREVENT_DEFAULT ) ){
this.looped = true;
this.looped = true;
- this.disatcher[ 'dispatch' ]( X_EVENT_MEDIA_LOOPED );
+ this.dis
p
atcher[ 'dispatch' ]( X_EVENT_MEDIA_LOOPED );
this.actualPlay();
};
} else {
this.actualPause();
this.actualPlay();
};
} else {
this.actualPause();
- this.disatcher[ 'dispatch' ]( X_EVENT_MEDIA_ENDED );
+ this.dis
p
atcher[ 'dispatch' ]( X_EVENT_MEDIA_ENDED );
delete this._timerID;
return X_CALLBACK_UN_LISTEN;
};
delete this._timerID;
return X_CALLBACK_UN_LISTEN;
};