X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=0.6.x%2Fjs%2F07_audio%2F10_XAudioSprite.js;h=45caa32ef9200decca53e9e402268624313cd7ad;hb=42e0982b02a99c71702ce8cd8740645aefdc8097;hp=289d31975a9347259f3540fd4e0748be157e7312;hpb=a130cabd01fde8865990a59d849f5d5d08ed2119;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 289d319..45caa32 100644
--- a/0.6.x/js/07_audio/10_XAudioSprite.js
+++ b/0.6.x/js/07_audio/10_XAudioSprite.js
@@ -19,7 +19,7 @@ var X_Audio_Sprite_shouldUse        = window.HTMLAudioElement && ( X_UA[ 'iOS' ]
 		presets     : {},
 		BGMs        : {},
 		tracks      : [],
-		pauseTracks : [], // X_Event.DEACTIVATE によって pause した再生中のトラックたち。
+		pauseTracks : [], // X_EVENT_DEACTIVATE によって pause した再生中のトラックたち。
 		volume      : 1,
 		bgmTrack    : null,
 		bgmPosition : 0,
@@ -29,21 +29,21 @@ var X_Audio_Sprite_shouldUse        = window.HTMLAudioElement && ( X_UA[ 'iOS' ]
 	},
 	X_Audio_Sprite_instance;
 
-X.Audio.Sprite = {
+X[ 'Audio' ][ 'Sprite' ] = {
 	
-	shouldUse        : X_Audio_Sprite_shouldUse,
+	'shouldUse'        : X_Audio_Sprite_shouldUse,
 	
-	needTouchFirst   : X_Audio_Sprite_needTouchFirst,
+	'needTouchFirst'   : X_Audio_Sprite_needTouchFirst,
 	
-	enableMultiTrack : X_Audio_Sprite_enableMultiTrack,
+	'enableMultiTrack' : X_Audio_Sprite_enableMultiTrack,
 	
-	create : function( setting ){
+	'create' : function( setting ){
 		// close()
 		if( X_Audio_Sprite_instance ){
 			X_Audio_Sprite_instance.close();
 		} else {
-			X_Audio_Sprite_instance = X_Class_override( new X.EventDispatcher(), X_Audio_Sprite_members );
-			X_ViewPort.listen( [ X_Event.VIEW_ACTIVATE, X_Event.VIEW_DEACTIVATE ], X_Audio_Sprite_instance, X_Audio_Sprite_handleEvent );
+			X_Audio_Sprite_instance = X_Class_override( X_EventDispatcher(), X_Audio_Sprite_members );
+			X_ViewPort[ 'listen' ]( [ X_EVENT_VIEW_ACTIVATE, X_EVENT_VIEW_DEACTIVATE ], X_Audio_Sprite_instance, X_Audio_Sprite_handleEvent );
 		};
 		X_Audio_Sprite_instance.setup( setting );
 		return X_Audio_Sprite_instance;
@@ -83,12 +83,12 @@ function X_Audio_Sprite_getTrackEnded(){
  *   BGM_02 : [ '56.00', '1:15.230', true ]
  * }
  * 
- * X_Event.BACKEND_READY
- * X_Event.BACKEND_NONE
+ * X_EVENT_BACKEND_READY
+ * X_EVENT_BACKEND_NONE
  * 
- * X_Event.READY
- * X_Event.MEDIA_LOOPED
- * X_Event.MEDIA_ENDED
+ * X_EVENT_READY
+ * X_EVENT_MEDIA_LOOPED
+ * X_EVENT_MEDIA_ENDED
  * 
  */
 
@@ -116,7 +116,7 @@ X_Audio_Sprite_members = {
 			for( k in setting ){
 				v = setting[ k ];
 				if( X_Type_isArray( v ) && v !== urls ){
-					v = X.Object.cloneArray( v );
+					v = X_Object_cloneArray( v );
 					for( i = v.length; i; ){
 						--i;
 						if( i !== 2 ) v[ i ] = X_AudioWrapper_timeStringToNumber( v[ i ] );
@@ -130,10 +130,10 @@ X_Audio_Sprite_members = {
 				if( video || ( i === 1 && X_Audio_Sprite_useVideoForMulti ) ){
 					option[ 'useVideo' ] = true;
 				};
-				tracks.push( X.Audio( urls, X.Object.clone( option ) ) );
+				tracks.push( X.Audio( urls, X_Object_clone( option ) ) );
 			};
 			
-			tracks[ n - 1 ].listenOnce( [ X_Event.BACKEND_READY, X_Event.BACKEND_NONE ], this, X_Audio_Sprite_handleEvent );
+			tracks[ n - 1 ][ 'listenOnce' ]( [ X_EVENT_BACKEND_READY, X_EVENT_BACKEND_NONE ], this, X_Audio_Sprite_handleEvent );
 			
 			X_Audio_Sprite_instance.numTracks = n;
 		},
@@ -145,7 +145,7 @@ X_Audio_Sprite_members = {
 				k;
 			
 			while( tracks.length ){
-				tracks.pop().kill();
+				tracks.pop()[ 'kill' ]();
 			};
 			
 			for( k in bgms ){
@@ -171,7 +171,7 @@ X_Audio_Sprite_members = {
 					//tracks[ i ].play( 0, X_Audio_Sprite_lengthSilence, true, 0, X_Audio_Sprite_lengthSilence ).seek( 0 );
 					this.pause( i );
 				} else {
-					X_Audio_getAudioWrapper( tracks[ i ] )._rawObject.load();
+					X_Audio_getAudioWrapper( tracks[ i ] )[ '_rawObject' ].load();
 				};
 			};
 		},
@@ -205,7 +205,7 @@ X_Audio_Sprite_members = {
 						track = X_Audio_Sprite_TEMP.bgmTrack = tracks[ 0 ];
 					};
 					
-					if( track.listen( [ X_Event.MEDIA_PLAYING, X_Event.MEDIA_BEFORE_LOOP ], this, X_Audio_Sprite_handleEvent ).isPlaying() ){
+					if( track[ 'listen' ]( [ X_EVENT_MEDIA_PLAYING, X_EVENT_MEDIA_BEFORE_LOOP ], this, X_Audio_Sprite_handleEvent ).isPlaying() ){
 						track
 							.state( {
 								loop          : true,
@@ -227,7 +227,7 @@ X_Audio_Sprite_members = {
 					if( 1 < tracks.length ){
 						track = X_Audio_Sprite_getTrackEnded( X_Audio_Sprite_TEMP.bgmPlaying );
 						track
-							.listen( [ X_Event.MEDIA_PLAYING, X_Event.MEDIA_BEFORE_LOOP ], this, X_Audio_Sprite_handleEvent )
+							[ 'listen' ]( [ X_EVENT_MEDIA_PLAYING, X_EVENT_MEDIA_BEFORE_LOOP ], this, X_Audio_Sprite_handleEvent )
 							.state( { looped : false } )
 							.play( preset[ 0 ], preset[ 1 ], true, 0, X_Audio_Sprite_lengthSilence );
 					} else {
@@ -239,7 +239,7 @@ X_Audio_Sprite_members = {
 						};
 						track = tracks[ 0 ];
 					
-						if( track.listen( [ X_Event.MEDIA_PLAYING, X_Event.MEDIA_BEFORE_LOOP ], this, X_Audio_Sprite_handleEvent ).isPlaying() ){
+						if( track[ 'listen' ]( [ X_EVENT_MEDIA_PLAYING, X_EVENT_MEDIA_BEFORE_LOOP ], this, X_Audio_Sprite_handleEvent ).isPlaying() ){
 							track
 								.state( {
 									loop          : true,
@@ -268,7 +268,7 @@ X_Audio_Sprite_members = {
 				X_Audio_Sprite_TEMP.bgmTrack    = null;
 			};
 			track && track.play( 0, X_Audio_Sprite_lengthSilence, true, 0, X_Audio_Sprite_lengthSilence ).seek( 0 );
-			this.asyncDispatch( X_Event.MEDIA_PAUSED );
+			this[ 'asyncDispatch' ]( X_EVENT_MEDIA_PAUSED );
 			return this;
 		},
 		
@@ -318,11 +318,11 @@ function X_Audio_Sprite_handleEvent( e ){
 	var i, tracks, track, _e;
 	
 	switch( e.type ){
-		case X_Event.BACKEND_READY :
+		case X_EVENT_BACKEND_READY :
 			_e = {
-				type        : X_Event.BACKEND_READY,
-				source      : e.source,
-				backendName : e.backendName
+				'type'        : X_EVENT_BACKEND_READY,
+				'source'      : e[ 'source' ],
+				'backendName' : e[ 'backendName' ]
 			};
 			
 			if( X_Audio_Sprite_needTouchFirst ){
@@ -332,11 +332,11 @@ function X_Audio_Sprite_handleEvent( e ){
 					_e[ 'needTouchForLoad' ] = true;
 				};
 			};
-			this.asyncDispatch( _e );
+			this[ 'asyncDispatch' ]( _e );
 			
 			e.target
-				.unlisten( X_Event.BACKEND_NONE, this, X_Audio_Sprite_handleEvent )
-				.listenOnce( X_Event.READY, this, X_Audio_Sprite_handleEvent );
+				[ 'unlisten' ]( X_EVENT_BACKEND_NONE, this, X_Audio_Sprite_handleEvent )
+				[ 'listenOnce' ]( X_EVENT_READY, this, X_Audio_Sprite_handleEvent );
 
 			// READY, needTouchForPlay, needTouchForLoad
 			if( X_Audio_HTMLAudioWrapper_durationFix ){
@@ -346,36 +346,36 @@ function X_Audio_Sprite_handleEvent( e ){
 			};
 			break;
 
-		case X_Event.BACKEND_NONE :
-			this.asyncDispatch( X_Event.BACKEND_NONE );
-			e.target.unlisten( X_Event.BACKEND_READY, this, X_Audio_Sprite_handleEvent );
+		case X_EVENT_BACKEND_NONE :
+			this[ 'asyncDispatch' ]( X_EVENT_BACKEND_NONE );
+			e.target[ 'unlisten' ]( X_EVENT_BACKEND_READY, this, X_Audio_Sprite_handleEvent );
 			break;
 		
-		case X_Event.READY :
+		case X_EVENT_READY :
 			console.log( 'X.AudioSprite - Ready!' );
 			if( X_Audio_Sprite_needTouchAndroid ){
 				for( i = 0; i < X_Audio_Sprite_TEMP.tracks.length; ++i ){
 					X_Audio_Sprite_instance.pause( i );
 				};
-				e.target.listenOnce( X_Event.MEDIA_PLAYING, this, this.asyncDispatch, [ X_Event.READY ] ); // Android 標準ブラウザ
+				e.target[ 'listenOnce' ]( X_EVENT_MEDIA_PLAYING, this, this.asyncDispatch, [ X_EVENT_READY ] ); // Android 標準ブラウザ
 				return;
 			};
-			this.asyncDispatch( X_Event.READY );
+			this[ 'asyncDispatch' ]( X_EVENT_READY );
 			break;
 			
-		case X_Event.MEDIA_PLAYING :
-			( e.target === X_Audio_Sprite_TEMP.bgmTrack || !e.target.state().looped ) && this.asyncDispatch( X_Event.MEDIA_PLAYING );
+		case X_EVENT_MEDIA_PLAYING :
+			( e.target === X_Audio_Sprite_TEMP.bgmTrack || !e.target.state().looped ) && this[ 'asyncDispatch' ]( X_EVENT_MEDIA_PLAYING );
 			break;
 		
-		case X_Event.MEDIA_BEFORE_LOOP :
+		case X_EVENT_MEDIA_BEFORE_LOOP :
 			if( e.target === X_Audio_Sprite_TEMP.bgmTrack ){
 				X_Audio_Sprite_TEMP.bgmLooped = true;
-				this.asyncDispatch( X_Event.MEDIA_LOOPED ); // TODO uid
+				this[ 'asyncDispatch' ]( X_EVENT_MEDIA_LOOPED ); // TODO uid
 			} else {
 				if( e.target.state().looped ){
-					//this.asyncDispatch( X_Event.MEDIA_LOOPED ); // TODO uid
+					//this[ 'asyncDispatch' ]( X_EVENT_MEDIA_LOOPED ); // TODO uid
 				} else {
-					this.asyncDispatch( X_Event.MEDIA_ENDED ); // TODO uid
+					this[ 'asyncDispatch' ]( X_EVENT_MEDIA_ENDED ); // TODO uid
 				};
 				
 				// single track | iOS
@@ -387,14 +387,14 @@ function X_Audio_Sprite_handleEvent( e ){
 			};
 			break;
 		
-		case X_Event.VIEW_ACTIVATE :
+		case X_EVENT_VIEW_ACTIVATE :
 			console.log( '■ アクティブ' );
 			// track.play(); or iOS need touch??
 			tracks = X_Audio_Sprite_TEMP.pauseTracks;
 			while( tracks.length ) tracks.pop().play();
 			break;
 
-		case X_Event.VIEW_DEACTIVATE :
+		case X_EVENT_VIEW_DEACTIVATE :
 			console.log( '■ デアクティブ' );
 			// track.pause();
 			tracks = X_Audio_Sprite_TEMP.tracks;
@@ -405,8 +405,8 @@ function X_Audio_Sprite_handleEvent( e ){
 			};
 			break;
 		
-		case X_Event.KILL_INSTANCE :
-			X_ViewPort.unlisten( [ X_Event.VIEW_ACTIVATE, X_Event.VIEW_DEACTIVATE ], this, X_Audio_Sprite_handleEvent );
+		case X_EVENT_KILL_INSTANCE :
+			X_ViewPort[ 'unlisten' ]( [ X_EVENT_VIEW_ACTIVATE, X_EVENT_VIEW_DEACTIVATE ], this, X_Audio_Sprite_handleEvent );
 			this.close();
 			break;
 	};