X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=0.6.x%2Fjs%2F07_audio%2F02_XHTMLAudio.js;h=7acc1e01040c20f6aec0369de8d45021f72ad7ef;hb=54eba266c29baf743f6ac67942a2788cd697b12d;hp=30b27945c0c5e62d01b64a02056d3ba654c89219;hpb=486d19a050444ad4d5277fa65a3da437f778ff0f;p=pettanr%2FclientJs.git

diff --git a/0.6.x/js/07_audio/02_XHTMLAudio.js b/0.6.x/js/07_audio/02_XHTMLAudio.js
index 30b2794..7acc1e0 100644
--- a/0.6.x/js/07_audio/02_XHTMLAudio.js
+++ b/0.6.x/js/07_audio/02_XHTMLAudio.js
@@ -66,12 +66,14 @@ var
 
 	X_HTMLAudio_need1stTouch	= X_UA[ 'iOS' ] || 4.2 <= X_UA[ 'AOSP' ] || X_UA[ 'ChromeWV' ] || X_UA[ 'WinPhone' ] || ( X_UA[ 'Blink' ] && X_UA[ 'Android' ] ),
 
-	X_HTMLAudio_playTrigger     = ( X_UA[ 'WinPhone' ] && X_UA[ 'IE9' ] ) ? 'canplay' : X_UA[ 'iOS' ] ? 'suspend' : X_UA[ 'Blink' ] ? 'stalled' : 'canplaythrough',
+	X_HTMLAudio_playTrigger     = ( X_UA[ 'WinPhone' ] && X_UA[ 'IE9' ] ) ? 'canplay' : X_UA[ 'iOS' ] ? 'suspend' : X_UA[ 'Blink' ] < 32 ? 'stalled' : 'canplaythrough',
 
 	X_HTMLAudio_durationFix	    = X_UA[ 'iOS' ] || X_UA[ 'ChromeWV' ] || ( X_UA[ 'WinPhone' ] && X_UA[ 'IE9' ] ) ||
-								( X_UA[ 'Windows' ] && 12 <= X_UA[ 'Opera' ] ) || ( X_UA[ 'Blink' ] && X_UA[ 'Android' ] ),
+								( X_UA[ 'Windows' ] && 12 <= X_UA[ 'Opera' ] ) || ( X_UA[ 'Blink' ] < 36 && X_UA[ 'Android' ] ),
 
-	X_HTMLAudio_shortPlayFix	= X_UA[ 'AOSP' ]; // Android 4.1.1 でも遭遇
+	X_HTMLAudio_shortPlayFix	= X_UA[ 'AOSP' ],
+	
+	X_HTMLAudio_progressEnabled = !( X_UA[ 'Opera' ] && X_UA[ 'Android' ] ) && !( X_UA[ 'WinPhones' ] && X_UA[ 'IE9' ] ); // Android 4.1.1 でも遭遇
 
 if( X_Audio_constructor ){
 	
@@ -81,6 +83,7 @@ if( X_Audio_constructor ){
 		{
 			// 1: canplaythrought|timeupdateに達している、またはdurationFixが終了している
 			// 2: READY イベント発火済
+			// 3: 1, 2 が済
 			_readyState       : 0,
 			_src			  : '',
 			
@@ -214,7 +217,7 @@ if( X_Audio_constructor ){
 						// console.log( e.loaded + ' ' + e.total * 100 + '%' );
 						// iem9 で常に0 raw.networkState;
 						// opera Android 12 で　buffered.end() へのアクセスはエラー　try catch も無効、iem9 は常に end(0) = 0
-						if( !( X_UA[ 'Opera' ] && X_UA[ 'Android' ] ) && !( X_UA[ 'WinPhones' ] && X_UA[ 'IE9' ] ) && this.duration ){
+						if( X_HTMLAudio_progressEnabled && this.duration && this._readyState < 3 ){
 							buf  = raw.buffered;
 							time = 0;
 							for( i = 0, l = buf.length; i < l; ++i ){
@@ -364,7 +367,7 @@ if( X_Audio_constructor ){
 					};
 				} else
 				if( this._readyState === 1 && this.duration ){
-					this._readyState = 2;
+					this._readyState |= 2;
 					this.disatcher[ 'asyncDispatch' ]( X_EVENT_READY );
 					console.log( '> Audio Loaded!! ' + e.type + ' d:' + ( this.duration | 0 ) );
 				} else
@@ -400,7 +403,7 @@ if( X_Audio_constructor ){
 					};
 					this._touchState = 3;
 				} else
-				if( this._readyState !== 2 && this._durationFixPhase < 2 ){
+				if( this._readyState !== 3 && this._durationFixPhase < 2 ){
 					return;
 				};