X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=0.6.x%2Fjs%2F07_audio%2F05_XWMPAudio.js;h=a0958189fce27cf4b36490d4f4b50d60052f75c4;hb=512e08f4d38eab417f9651277e8a50c08535cb07;hp=075f5374c7f14bddbff3d080cf323bbfe4ba3903;hpb=3c07e12e13272820cedf983e0d9fe46e5f0a4bd9;p=pettanr%2FclientJs.git

diff --git a/0.6.x/js/07_audio/05_XWMPAudio.js b/0.6.x/js/07_audio/05_XWMPAudio.js
index 075f537..a095818 100644
--- a/0.6.x/js/07_audio/05_XWMPAudio.js
+++ b/0.6.x/js/07_audio/05_XWMPAudio.js
@@ -7,7 +7,7 @@
 
 var X_WMPAudio;
 
-if( X_Pulgin_WMP_VERSION ){ // IETester で 6.x は不可
+if( X_Plugin_WMP_VERSION ){ // IETester で 6.x は不可
 	X_WMPAudio = X_AudioBase[ 'inherits' ](
 		'X.WMPAudio',
 		X_Class.POOL_OBJECT,
@@ -26,7 +26,7 @@ if( X_Pulgin_WMP_VERSION ){ // IETester で 6.x は不可
 				this.disatcher   = disatcher || this;
 				this._source     = source;
 				
-				if( 7 <= X_Pulgin_WMP_VERSION ){
+				if( 7 <= X_Plugin_WMP_VERSION ){
 	    			this.xnodeObject = X_Node_systemNode[ 'create' ]( 'object', {
 		    					'classID' : 'CLSID:6BF52A52-394A-11d3-B153-00C04F79FAA6',
 		    					width     : 1,
@@ -59,7 +59,7 @@ if( X_Pulgin_WMP_VERSION ){ // IETester で 6.x は不可
 				switch( e.type ){
 					case X_EVENT_AFTER_UPDATE :
 						this._readyState = 1;
-						if( 7 <= X_Pulgin_WMP_VERSION ){
+						if( 7 <= X_Plugin_WMP_VERSION ){
 							this._wmp          = this.xnodeObject[ '_rawObject' ];
 							this._wmp[ 'URL' ] = this._source;
 							this.wmp           = this._wmp[ 'controls' ];
@@ -114,7 +114,7 @@ if( X_Pulgin_WMP_VERSION ){ // IETester で 6.x は不可
 					
 					// road 中の場合
 					if( this._readyState === 1 ){
-						if( 7 <= X_Pulgin_WMP_VERSION ){
+						if( 7 <= X_Plugin_WMP_VERSION ){
 					    	progress = this._wmp[ 'network' ][ 'downloadProgress' ];
 						} else {
 					    	progress = this.wmp[ 'BufferingProgress' ];
@@ -123,7 +123,7 @@ if( X_Pulgin_WMP_VERSION ){ // IETester で 6.x は不可
 							this.disatcher[ 'dispatch' ]( { type : X_EVENT_PROGRESS, 'percent' : progress } );
 						} else {
 							this._readyState = 2;
-							if( 7 <= X_Pulgin_WMP_VERSION ){
+							if( 7 <= X_Plugin_WMP_VERSION ){
 						    	this.duration = this._wmp[ 'currentMedia' ].duration * 1000 | 0;
 							} else {
 						    	this.duration = this.wmp[ 'Duration' ] * 1000 | 0;
@@ -181,7 +181,7 @@ if( X_Pulgin_WMP_VERSION ){ // IETester で 6.x は不可
 			},
 
 			setVolume : function(){
-				if( 7 <= X_Pulgin_WMP_VERSION ){
+				if( 7 <= X_Plugin_WMP_VERSION ){
 			    	this._wmp[ 'settings' ][ 'Volume' ] = this.gain * 100;
 				} else {
 			    	this.wmp[ 'Volume' ] = ( 1 - this.gain ) * 10000;
@@ -207,10 +207,11 @@ if( X_Pulgin_WMP_VERSION ){ // IETester で 6.x は不可
 	X_Audio_BACKENDS.push( {
 		backendID   : 16,
 		
-		backendName : 'WMP' + X_Pulgin_WMP_VERSION,
+		backendName : 'WMP' + X_Plugin_WMP_VERSION,
 
 		canPlay : {
 			'mp3'  : true,
+			'm4a'  : true,
 			'wma'  : true,
 			'wav'  : true,
 			'mid'  : true,
@@ -218,12 +219,12 @@ if( X_Pulgin_WMP_VERSION ){ // IETester で 6.x は不可
 			'snd'  : true,
 			'au'   : true,
 			'aif'  : true,
-			'aicf' : true,
-			'aiff' : true
+			'aiff' : true,
+			'aicf' : true
 		},
 
 		detect : function( proxy, source, ext ){
-			proxy[ 'asyncDispatch' ]( { type : X_EVENT_COMPLETE, canPlay : ext === 'mp3' || ext === 'wma' || ext === 'wav' } );				
+			proxy[ 'asyncDispatch' ]( { type : X_EVENT_COMPLETE, canPlay : 0 <= 'mp3 m4a wma wav midi snd au aiff aicf'.indexOf( ext ) } );				
 		},
 		
 		klass : X_WMPAudio