X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;ds=sidebyside;f=0.6.x%2Fjs%2F07_audio%2F10_XAudioSprite.js;h=542eea11c24d55f2e1e5c7f27a1f981155bd7347;hb=7973f3ff61f1ef5bd9732f527b175010d0c0971b;hp=d6a40b66413831419c9b03583e5cfb8b36232f66;hpb=8e63f506d14490e852fa557d326ca91f9cdd3baf;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 d6a40b6..542eea1 100644
--- a/0.6.x/js/07_audio/10_XAudioSprite.js
+++ b/0.6.x/js/07_audio/10_XAudioSprite.js
@@ -8,7 +8,7 @@ var X_Audio_Sprite_shouldUse        = window.HTMLAudioElement && ( X_UA[ 'iOS' ]
 	X_Audio_Sprite_useVideoForMulti = 4 <= X_UA[ 'AndroidBrowser' ] && 534.3 < X_UA[ 'AndroidWebkit' ], // ドスパラパッドはビデオのインライン再生が不可 
 	X_Audio_Sprite_needTouchAndroid = X_Audio_Sprite_useVideoForMulti,	
 	X_Audio_Sprite_needTouchFirst   = X_UA[ 'iOS' ] || X_Audio_Sprite_needTouchAndroid || ( X_UA[ 'WinPhone' ] && X_UA[ 'IE9' ] ),
-	X_Audio_Sprite_enableMultiTrack = !( X_UA[ 'iOS' ] && !X_Audio_WebAudio_context ) && !( X_UA[ 'AndroidBrowser4' ] && X_UA[ 'AndroidWebkit' ] <= 534.3 ),
+	X_Audio_Sprite_enableMultiTrack = !( X_UA[ 'iOS' ] && !X_Audio_WebAudio_context ) && !( X_UA[ 'AndroidBrowser4' ] && X_UA[ 'AndroidWebkit' ] <= 534.3 ) && !( X_UA[ 'WinPhone' ] && X_UA[ 'IE9' ] ),
 	X_Audio_Sprite_enableVolume     = window.HTMLAudioElement && ( !X_UA[ 'iOS' ] && !X_UA[ 'AndroidBrowser' ] && !X_UA[ 'OperaMobile' ] && !X_UA[ 'OperaTablet' ] ), // TODO fennec は　25以上
 	X_Audio_Sprite_maxTracks        = !X_Audio_Sprite_enableMultiTrack ? 1 : X_Audio_Sprite_useVideoForMulti ? 2 : 9,
 	X_Audio_Sprite_lengthSilence    = 10000, // 一番最初の無音部分の長さ
@@ -59,7 +59,7 @@ X[ 'AudioSprite' ] = function( setting ){
 	for( k in setting ){
 		v = setting[ k ];
 		if( X_Type_isArray( v ) && v !== urls ){
-			v = X_Object_cloneArray( v );
+			v = X_Array_copy( v );
 			for( i = v.length; i; ){
 				--i;
 				if( i !== 2 ) v[ i ] = X_AudioWrapper_timeStringToNumber( v[ i ] );
@@ -69,7 +69,7 @@ X[ 'AudioSprite' ] = function( setting ){
 		};
 	};
 	
-	X_Audio_startDetectionBackend( X_Audio_BACKENDS[ 0 ], X_Audio_Sprite_instance, X_Object_cloneArray( urls ), option );
+	X_Audio_startDetectionBackend( X_Audio_BACKENDS[ 0 ], X_Audio_Sprite_instance, X_Array_copy( urls ), option );
 
 	X_Audio_Sprite_instance[ 'listenOnce' ]( [ X_EVENT_BACKEND_READY, X_EVENT_BACKEND_NONE ], X_AudioSprite_backendHandler );
 	X_Audio_Sprite_instance[ 'listenOnce' ]( X_EVENT_KILL_INSTANCE, X_Audio_Sprite_handleEvent );
@@ -134,7 +134,7 @@ X_Audio_Sprite_members = {
 				i = 0, l = tracks.length;
 			for( ; i < l; ++i ){
 				if( X_UA[ 'WinPhone' ] ){
-					console.log( 'touch -> play()' );
+					console.log( 'WinPhone : touch -> play()' );
 					//tracks[ i ].play( 0, X_Audio_Sprite_lengthSilence, true, 0, X_Audio_Sprite_lengthSilence ).seek( 0 );
 					this[ 'pause' ]( i );
 				} else {
@@ -339,13 +339,11 @@ function X_AudioSprite_backendHandler( e ){
 			};
 			
 			return X_Callback_STOP_NOW;
-			break;
 
 		case X_EVENT_BACKEND_NONE :
 			this[ 'unlisten' ]( X_EVENT_BACKEND_READY, this, X_AudioSprite_backendHandler )
 				[ 'asyncDispatch' ]( X_EVENT_BACKEND_NONE );
 			return X_Callback_STOP_NOW;
-			break;
 		
 		case X_EVENT_READY :
 			console.log( 'X.AudioSprite - Ready!' );