X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=0.6.x%2Fjs%2F07_audio%2F01_XWebAudio.js;h=98eee1bd17abf40e1fe58f825b3372d6ec1cfd3b;hb=bafa8683f87b2f909d1301fca80684bf9ff221ed;hp=292b6b4d4580439c3f242d3a2cf324f728c37d90;hpb=54eba266c29baf743f6ac67942a2788cd697b12d;p=pettanr%2FclientJs.git

diff --git a/0.6.x/js/07_audio/01_XWebAudio.js b/0.6.x/js/07_audio/01_XWebAudio.js
index 292b6b4..98eee1b 100644
--- a/0.6.x/js/07_audio/01_XWebAudio.js
+++ b/0.6.x/js/07_audio/01_XWebAudio.js
@@ -79,7 +79,9 @@ if( X_Audio_constructor ){
 
 
 var X_WebAudio_context      =	// 4s 以下ではない iPad 2G または iPad mini 1G 以下ではない, iPod touch 4G 以下ではない
-								!X_UA[ 'iPhone_4s' ]  && !X_UA[ 'iPad_2Mini1' ]  && !X_UA[ 'iPod_4' ]  &&
+								!X_UA[ 'iPhone_4s' ] && !X_UA[ 'iPad_2Mini1' ] && !X_UA[ 'iPod_4' ] &&
+								// iOS7 以上で HTML Audio が鳴らない問題を見ていくよ
+								// !X_UA[ 'iOS' ] &&
 								// Android2 + Gecko で WebAudio が極めて不安定
 								!( X_UA[ 'Fennec' ] && X_UA[ 'Android' ] < 3 ) &&
 								// AOSP でも WebAudio を不完全に実装するものがある, touch の有無も不明のため一律に切ってしまう
@@ -88,7 +90,7 @@ var X_WebAudio_context      =	// 4s 以下ではない iPad 2G または iPad mi
 								//!X_UA[ 'Blink' ] &&
 								// Firefox40.0.5 + Windows8 で音声が途中から鳴らなくなる
 								// Firefox41.0.1 + Windows8 で音声が途中から鳴らなくなる
-								!( 40 <= X_UA[ 'Gecko' ] && X_UA[ 'Gecko' ] < 43 && X_UA[ 'Windows' ] ) &&
+								!( 40 <= X_UA[ 'Gecko' ] && X_UA[ 'Gecko' ] < 45 && X_UA[ 'Windows' ] ) &&
 								( window[ 'AudioContext' ] || window[ 'webkitAudioContext' ] ),
 	X_WebAudio_BUFFER_LIST  = [],
 	X_WebAudio_need1stTouch	= X_UA[ 'iOS' ],
@@ -166,7 +168,7 @@ if( X_WebAudio_context ){
 				_onDecodeSuccess : function( buffer ){
 					this.onDecodeSuccess && this._onDecodeComplete();
 					
-	                if ( !buffer ) {
+	                if( !buffer ){
 	                	this.errorState = 2;
 	                    this[ 'asyncDispatch' ]( X_EVENT_COMPLETE );
 	                    return;
@@ -198,6 +200,7 @@ if( X_WebAudio_context ){
 			unregister : function( webAudio ){
 				var list = this.webAudioList,
 					i    = list.indexOf( webAudio );
+
 				if( 0 < i ){
 					list.splice( i, 1 );
 					if( !list.length ){
@@ -221,7 +224,7 @@ if( X_WebAudio_context ){
 			_startPos       : 0,
 			_endPosition    : 0,
 			_startTime      : 0,
-            _timerID        : 0,
+            //_timerID        : 0,
             _interval       : 0,
           	audioBuffer     : null,
           	bufferSource    : null,
@@ -289,7 +292,6 @@ if( X_WebAudio_context ){
 					
 	                if ( !buffer ) {
 	                	this.error = loader.errorState;
-	                	
 	                    this.disatcher[ 'dispatch' ]({
 								type    : X_EVENT_ERROR,
 								error   : loader.errorState,
@@ -352,8 +354,8 @@ if( X_WebAudio_context ){
                 	//console.log( '> use onended' );
                 	//this.bufferSource.onended = this._onended || ( this._onended = X_Closure_create( this, this._onEnded ) );
                 //} else {
-                	this._timerID && X_Timer_remove( this._timerID );
-					this._timerID = X_Timer_once( end - begin, this, this._onEnded );
+                	//this._timerID && X_Timer_remove( this._timerID );
+					//this._timerID = X_Timer_once( end - begin, this, this._onEnded );
                 //};
 	
 	            if( this.bufferSource.start ){
@@ -366,7 +368,8 @@ if( X_WebAudio_context ){
 	            this._startPos    = begin;
 	            this._endPosition = end;
 	            this._startTime   = X_WebAudio_context.currentTime * 1000;
-	            this._interval    = this._interval || X_Timer_add( 1000, 0, this, this._onInterval );
+	            // this._interval    = this._interval || X_Timer_add( 1000, 0, this, this._onInterval );
+	            this._interval    = this._interval || X_Timer_add( 100, 0, this, this._onEnded );
 			},
 			
 				_sourceDispose : function(){
@@ -375,17 +378,18 @@ if( X_WebAudio_context ){
 		            delete this.bufferSource;
 		        },
 
+				/* 
 				_onInterval : function(){
 					if( !this.playing ){
 						delete this._interval;
 						return X_CALLBACK_UN_LISTEN;
 					};
 					this.disatcher[ 'dispatch' ]( X_EVENT_MEDIA_PLAYING );
-				},
-						
+				}, */
+					
 				_onEnded : function(){
 					var time;
-					delete this._timerID;
+					//delete this._timerID;
 					
 		            if( this.playing ){
 		            	time = X_WebAudio_context.currentTime * 1000 - this._startTime - this._endPosition + this._startPos | 0;
@@ -395,9 +399,10 @@ if( X_WebAudio_context ){
 			            	if( time < 0 ) return;
 		            	} else {
 		            		if( time < 0 ){
+		            			this.disatcher[ 'dispatch' ]( X_EVENT_MEDIA_PLAYING );
 		            			//console.log( '> onEnd crt:' + ( X_WebAudio_context.currentTime * 1000 ) + ' startTime:' + this._startTime +
 		            			//	' from:' + this._startPos + ' to:' + this._endPosition );
-		            			this._timerID = X_Timer_once( -time, this, this._onEnded );
+		            			// this._timerID = X_Timer_once( -time, this, this._onEnded );
 		            			return;
 		            		};
 		            	};
@@ -407,6 +412,9 @@ if( X_WebAudio_context ){
 		            			this.looped = true;
 		            			this.disatcher[ 'dispatch' ]( X_EVENT_MEDIA_LOOPED );
 		            			this.actualPlay();
+			            	} else {
+								delete this._interval;
+								return X_CALLBACK_UN_LISTEN;
 			            	};
 		            	} else {
 		            		this.actualPause();
@@ -418,8 +426,10 @@ if( X_WebAudio_context ){
 			actualPause : function(){
 				console.log( '[WebAudio] pause' );
 				
-	            this._timerID && X_Timer_remove( this._timerID );
-				delete this._timerID;
+	            //this._timerID && X_Timer_remove( this._timerID );
+				//delete this._timerID;
+				this._interval && X_Timer_remove( this._interval );
+				delete this._interval;
 				delete this.playing;
 
 	            if( this.bufferSource ){