From: itozyun <itozyun@user.sourceforge.jp>
Date: Sun, 5 Oct 2014 11:55:02 +0000 (+0900)
Subject: Version 0.6.90, performance fix for HTML5Audio & rename SilverLight -> Silverlight.
X-Git-Url: http://git.osdn.jp/view?a=commitdiff_plain;h=05ae2ffbbca8b1bdb4c3fcbfdd4e1708c0485360;p=pettanr%2FclientJs.git

Version 0.6.90, performance fix for HTML5Audio & rename SilverLight -> Silverlight.
---

diff --git a/0.6.x/js/02_plugin/00_XPlugin.js b/0.6.x/js/02_plugin/00_XPlugin.js
index 5df17a4..d7e2032 100644
--- a/0.6.x/js/02_plugin/00_XPlugin.js
+++ b/0.6.x/js/02_plugin/00_XPlugin.js
@@ -58,9 +58,9 @@ X.Pulgin = {
 
 	FlashEnabled       : X_Pulgin_FLASH_ENABLED,
 
-	SilverLight        : X_Pulgin_SILVER_LIGHT_VERSION,
+	Silverlight        : X_Pulgin_SILVER_LIGHT_VERSION,
 	
-	SilverLightEnabled : X_Pulgin_SILVER_LIGHT_ENABLED,
+	SilverlightEnabled : X_Pulgin_SILVER_LIGHT_ENABLED,
 	
 	Unity              : X_Pulgin_UNITY_VERSION,
 	
diff --git a/0.6.x/js/06_audio/00_XAudio.js b/0.6.x/js/06_audio/00_XAudio.js
index b4cb185..3727959 100644
--- a/0.6.x/js/06_audio/00_XAudio.js
+++ b/0.6.x/js/06_audio/00_XAudio.js
@@ -1,7 +1,7 @@
 X.Audio = {
 	HTML5       : 1,
 	Flash       : 2,
-	SilverLight : 3,
+	Silverlight : 3,
 	Unity       : 4,
 	WMP         : 5,
 	RealPlayer  : 6,
diff --git a/0.6.x/js/06_audio/01_XHTML5Audio.js b/0.6.x/js/06_audio/01_XHTML5Audio.js
index efbae42..5bea55f 100644
--- a/0.6.x/js/06_audio/01_XHTML5Audio.js
+++ b/0.6.x/js/06_audio/01_XHTML5Audio.js
@@ -137,8 +137,6 @@ if( window.HTMLAudioElement ){
 		{
 			
 			proxy           : null,
-			xnodeAudio      : null,
-			rawAudio        : null,
 			
 			_closed         : true,
 			_lastUserAction : '',
@@ -156,21 +154,23 @@ if( window.HTMLAudioElement ){
 				if( option.startTime ) this._startTime = option.startTime;
 				if( option.volume )    this._volume    = option.volume;
 				
-				this.xnodeAudio = new X.EventDispatcher( this.rawAudio = X_Audio_rawAudio || new Audio( source ) )//X.Dom.Node.create( 'audio', { src : source } ).appendToRoot();//( X.Dom.Node._systemNode );
-					.listen( [
+				this._rawObject = X_Audio_rawAudio || new Audio( source );//X.Dom.Node.create( 'audio', { src : source } ).appendToRoot();//( X.Dom.Node._systemNode );
+				
+				this.listen( [
 						'loadstart', 'load', 'progress', 'suspend', 'abort', 'error', 'emptied', 'stalled', 'play', 'pause', 'loadedmetadata',
 						'loadeddata', 'waiting', 'playing', 'canplay', 'canplaythrough', 'seeking', 'seeked', 'timeupdate', 'ended',
-						'ratechange', 'durationchange', 'volumechange' ], this, this.handleEventProxy );				
+						'ratechange', 'durationchange', 'volumechange' ], this.handleEventProxy );				
+				
 				if( X_Audio_rawAudio ){
 					X_Audio_rawAudio.src = source;
 					X_Audio_rawAudio.load(); // 要る?
 					X_Audio_rawAudio = null;
 				};
 
-				document.body.appendChild( this.rawAudio );
+				//document.body.appendChild( this._rawObject );
 
-				this.rawAudio.volume   = this._volume;
-				this.rawAudio.autoplay = false;
+				this._rawObject.volume   = this._volume;
+				this._rawObject.autoplay = false;
 				option.autoplay && X.Timer.once( 100, this, this.play );
 				
 				this.listenOnce( X.Event.KILL_INSTANCE );
@@ -180,8 +180,6 @@ if( window.HTMLAudioElement ){
 				switch( e.type ){
 
 					case X.Event.KILL_INSTANCE :
-						this.xnodeAudio.unlisten();
-						this.xnodeAudio.kill(); // <img> と同じく <audio> は pool した方がいいかも
 						break;
 				};
 			},
@@ -239,44 +237,44 @@ if( window.HTMLAudioElement ){
 			
 			    if( X.UA.Chrome ){ // [CHROME][FIX] volume TODO どの version で 修正される？
 			        // [!] delay
-			        X.Timer.once( 0, this, this._fixForChrome, [ this.rawAudio.volume ] );
-			        this.rawAudio.volume = 0;
+			        X.Timer.once( 0, this, this._fixForChrome, [ this._rawObject.volume ] );
+			        this._rawObject.volume = 0;
 			    };
 			    
-			    if( !this.rawAudio.paused ){
+			    if( !this._rawObject.paused ){
 			        this.currentTime( this._startTime );
 			    };
-			    this.rawAudio.play();
+			    this._rawObject.play();
 			},
 			
 			// [CHROME][FIX] volume
 			_fixForChrome : X.UA.Chrome && function( volume ){
-				!this._closed && ( this.rawAudio.volume = volume );
+				!this._closed && ( this._rawObject.volume = volume );
 			},
 			
 			pause : function(){
-			    if( !this._closed && !this.rawAudio.error ){
+			    if( !this._closed && !this._rawObject.error ){
 			        this._lastUserAction = 'pause';
-			        this.rawAudio.pause();  	
+			        this._rawObject.pause();  	
 			    };
 			},
 			
 			stop : function(){
-			    if( !this._closed && !this.rawAudio.error ){
+			    if( !this._closed && !this._rawObject.error ){
 			        this._lastUserAction = 'stop';
-			        this.rawAudio.pause();
+			        this._rawObject.pause();
 			        this.currentTime( this._startTime );
 			    };
 			},
 			
 			loop : function( v ){
 			    if( v === undefined ) return this._loop;
-			    this.rawAudio.loop = this._loop = v;
+			    this._rawObject.loop = this._loop = v;
 			},
 	
 			state : function(){
-			    var paused = !!this.rawAudio.paused,
-			        ended  = !!this.rawAudio.ended;
+			    var paused = !!this._rawObject.paused,
+			        ended  = !!this._rawObject.ended;
 			
 			    if( this._lastUserAction === 'stop' ){
 			        if( paused ){
@@ -286,18 +284,18 @@ if( window.HTMLAudioElement ){
 			    };
 			
 			    return {
-			        loop     : this.rawAudio.loop,
-			        error    : this.rawAudio.error    || 0,   // 0, 1 ~ 4
+			        loop     : this._rawObject.loop,
+			        error    : this._rawObject.error    || 0,   // 0, 1 ~ 4
 			        paused   : paused,
 			        ended    : ended,
-			        source   : this.rawAudio.src      || '',
-			        duration : this.rawAudio.duration || 0
+			        source   : this._rawObject.src      || '',
+			        duration : this._rawObject.duration || 0
 			    };
 			},
 	
 			volume : function( v ){
 			    if( v === undefined ) return this.audio.volume;
-			    this.rawAudio.volume = v;
+			    this._rawObject.volume = v;
 			},
 	
 			startTime : function( time ){
@@ -306,12 +304,12 @@ if( window.HTMLAudioElement ){
 			},
 	
 			currentTime : function( time ){
-			    if( time === undefined ) return this.rawAudio.currentTime;
-			    this.rawAudio.currentTime = time;
+			    if( time === undefined ) return this._rawObject.currentTime;
+			    this._rawObject.currentTime = time;
 			},
 	
 			isPlaying : function(){
-			    return !this.rawAudio.error && !this.rawAudio.paused && !this.rawAudio.ended;
+			    return !this._rawObject.error && !this._rawObject.paused && !this._rawObject.ended;
 			}
 	
 		}
diff --git a/0.6.x/js/06_audio/02_XSilverLightAudio.js b/0.6.x/js/06_audio/02_XSilverLightAudio.js
index e3dda4d..ca199d3 100644
--- a/0.6.x/js/06_audio/02_XSilverLightAudio.js
+++ b/0.6.x/js/06_audio/02_XSilverLightAudio.js
@@ -14,7 +14,7 @@ var X_Audio_SLAudio, X_Audio_SLAudioWrapper,
 	X_Audio_SLAudio_LIVE_LIST = [],
 	X_Audio_SLAudio_POOL_LIST = [];
 
-if( X.Pulgin.SilverLightEnabled ){
+if( X.Pulgin.SilverlightEnabled ){
 	
 	function getSLAudioWrapper( proxy ){
 		var i = X_Audio_SLAudio_LIVE_LIST.length;
@@ -26,7 +26,7 @@ if( X.Pulgin.SilverLightEnabled ){
 	X_Audio_SLAudio = X.Class._override(
 		new X.EventDispatcher(),
 		{
-			backendName : 'SilverLight Audio',
+			backendName : 'Silverlight Audio',
 
 			detect : function( source, ext ){
 				var ok = ext === 'mp3' || ext === 'wma';
@@ -89,10 +89,10 @@ if( X.Pulgin.SilverLightEnabled ){
 	};
 	
 	X_Audio_SLAudioWrapper = X.EventDispatcher.inherits(
-		'X.AV.SilverLightAudioWrapper',
+		'X.AV.SilverlightAudioWrapper',
 		X.Class.POOL_OBJECT,
 		{
-			_isSilverLight  : true, // for X.EventDispatcher.listen
+			_isSilverlight  : true, // for X.EventDispatcher.listen
     		proxy           : null,
     		_onload         : '',
     		_callback       : null,    		
@@ -122,8 +122,9 @@ if( X.Pulgin.SilverLightEnabled ){
 					// <script id="silverlightaudio" type="text/xaml"><Canvas xmlns="http://schemas.microsoft.com/client/2007" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"></Canvas></script>
 				};
 				/*
+				 *　［Silverlight 2］JavaScriptコードからSilverlightのオブジェクトを利用するには？［C#、VB］
 				 * http://www.atmarkit.co.jp/fdotnet/dotnettips/902slobjcallfromjs/slobjcallfromjs.html
-				 * 動いている
+				 * このページのサンプルは sl5+firefox32 環境で動いている。xaml を js から利用する形ではなく、.xap を sl4 以下で作るのがよさそう.
 				 */
 				this.proxy       = proxy;
     			this._onload     = 'XAudioSilverlightOnLoad';// + ( ++X_Audio_SLAudio_uid );
@@ -132,9 +133,9 @@ if( X.Pulgin.SilverLightEnabled ){
     				.create( 'object', {
 	    					type   : 'application/x-silverlight-2',
 	    					data   : 'data:application/x-silverlight-2,',
-	    					width  : 100,
-	    					height : 100
-    					}, { width : '20px', height : '20px', display : 'block', '-moz-binding' : 'none' } )
+	    					width  : 1,
+	    					height : 1
+    					})
 		    			.html(
 				            '<param name="background" value="#00000000">' +      // transparent
 				            '<param name="windowless" value="true">' +