Version 0.6.175, fix X.UA & X.WebAudio.

[pettanr/clientJs.git] / 0.6.x / js / 07_audio / 03_XSilverlightAudio.js

diff --git a/0.6.x/js/07_audio/03_XSilverlightAudio.js b/0.6.x/js/07_audio/03_XSilverlightAudio.js
index 30d9548..7133272 100644 (file)
--- a/0.6.x/js/07_audio/03_XSilverlightAudio.js
+++ b/0.6.x/js/07_audio/03_XSilverlightAudio.js
@@ -12,15 +12,23 @@
  * SilverlLight5 ie6&7(ietester,winxp), ie8(winxp) で動作確認。firefox32 では動作しない。(4以下の方がよい？)\r
  */\r
 \r
-var X_Audio_SLAudioWrapper,\r
-       X_Audio_SLAudio_uid = 0;\r
+var X_SLAudio,\r
+       X_SLAudio_uid = 0;\r
 \r
-if( X[ 'Pulgin' ][ 'SilverlightEnabled' ] && !X_HTMLAudio ){\r
+if( X[ 'Pulgin' ][ 'Silverlight' ] ){\r
        \r
        X_TEMP.slaudioInit = function(){\r
                //\r
                // http://blog.yuhiisk.com/archive/2014/12/20/dynamic-loading-and-complete-processing-of-script.html\r
-               var s = document.createElement( '<script id="silverlightaudio" type="text/xaml"></script>' );\r
+               var s;\r
+               \r
+               if( X_UA[ 'IE' ] < 9 ){\r
+                       s = document.createElement( '<script id="silverlightaudio" type="text/xaml"></script>' );\r
+               } else {\r
+                       s = document.createElement( 'script' );\r
+                       s.id   = 'silverlightaudio';\r
+                       s.type = 'text/xaml';\r
+               };\r
                \r
                document.getElementsByTagName( 'head' )[ 0 ].appendChild( s );\r
                s.text = '<Canvas xmlns="http://schemas.microsoft.com/client/2007" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"></Canvas>';\r
@@ -29,8 +37,8 @@ if( X[ 'Pulgin' ][ 'SilverlightEnabled' ] && !X_HTMLAudio ){
        };\r
        \r
        // X.Node.inherits はできない。_rawObject は <object> でなく silverlight\r
-       X_Audio_SLAudioWrapper = X_Audio_AbstractAudioBackend[ 'inherits' ](\r
-               'X.AV.SilverlightAudio',\r
+       X_SLAudio = X_AudioBase[ 'inherits' ](\r
+               'X.SilverlightAudio',\r
                X_Class.POOL_OBJECT,\r
                {\r
                        '_rawType'      : X_EventDispatcher_EVENT_TARGET_SILVER_LIGHT,\r
@@ -46,20 +54,20 @@ if( X[ 'Pulgin' ][ 'SilverlightEnabled' ] && !X_HTMLAudio ){
                        _interval       : 0, // setInterval timer id\r
                        \r
                        'Constructor' : function( target, source, option ){\r
-                               !X_Audio_SLAudio_uid && X_TEMP.slaudioInit();\r
+                               !X_SLAudio_uid && X_TEMP.slaudioInit();\r
                                \r
                                /*\r
                                 *　［Silverlight 2］JavaScriptコードからSilverlightのオブジェクトを利用するには？［C#、VB］\r
                                 * http://www.atmarkit.co.jp/fdotnet/dotnettips/902slobjcallfromjs/slobjcallfromjs.html\r
                                 * このページのサンプルは sl5+firefox32 環境で動いている。xaml を js から利用する形ではなく、.xap を sl4 以下で作るのがよさそう.\r
                                 */\r
-                               \r
-                               // TODO embed\r
                                this.target      = target || this;\r
                                this._source     = source;\r
                                // X.Audio._slOnload_ は不可\r
-                       this._onload     = 'XAudioSilverlightOnLoad' + ( ++X_Audio_SLAudio_uid );\r
+                       this._onload     = 'XAudioSilverlightOnLoad' + ( ++X_SLAudio_uid );\r
                                this._callback   = window[ this._onload ] = X_Closure_create( this, this.onSLReady );\r
+                               \r
+                               // TODO embed\r
                        this.xnodeObject = X_Node_body\r
                                [ 'create' ]( 'object', {\r
                                                type   : 'application/x-silverlight-2',\r
@@ -252,8 +260,8 @@ if( X[ 'Pulgin' ][ 'SilverlightEnabled' ] && !X_HTMLAudio ){
                                \r
                                this._lastUserAction = 0 <= this.seekTime ? 'seek' : 'play';\r
                                \r
-                               end   = X_AudioWrapper_getEndTime( this );\r
-                               begin = X_AudioWrapper_getStartTime( this, end, true ) | 0;\r
+                               end   = X_Audio_getEndTime( this );\r
+                               begin = X_Audio_getStartTime( this, end, true ) | 0;\r
 \r
                                // 1 秒以下は指定できないため四捨五入\r
                                begin = ( begin / 1000 | 0 ) * 1000 + ( 500 < begin % 1000 ? 1000 : 0 ); \r
@@ -300,7 +308,7 @@ if( X[ 'Pulgin' ][ 'SilverlightEnabled' ] && !X_HTMLAudio ){
                                        delete this._timerID;\r
                                        \r
                            if( this.playing ){\r
-                               //console.log( '> end ' + X_AudioWrapper_getEndTime( this ) + ' current:' + ( this.getActualCurrentTime() ) );\r
+                               //console.log( '> end ' + X_Audio_getEndTime( this ) + ' current:' + ( this.getActualCurrentTime() ) );\r
                                time = this.getActualCurrentTime();\r
                                \r
                                if( time < this._beginTime ){\r
@@ -311,11 +319,11 @@ if( X[ 'Pulgin' ][ 'SilverlightEnabled' ] && !X_HTMLAudio ){
                                        this._ended && this[ '_rawObject' ].play();\r
                                        this._ended = false;\r
                                        this.target[ 'dispatch' ]( X_EVENT_MEDIA_WAITING );\r
-                                       this._timerID = X_Timer_once( X_AudioWrapper_getEndTime( this ) - time, this, this._onEnded );\r
+                                       this._timerID = X_Timer_once( X_Audio_getEndTime( this ) - time, this, this._onEnded );\r
                                        return;\r
                                };\r
                                \r
-                               time -= X_AudioWrapper_getEndTime( this );\r
+                               time -= X_Audio_getEndTime( this );\r
                                if( time < 0 ){\r
                                        console.log( ' > まだ終わらない ' + time );\r
                                        this._ended && this[ '_rawObject' ].play();\r
@@ -363,7 +371,7 @@ if( X[ 'Pulgin' ][ 'SilverlightEnabled' ] && !X_HTMLAudio ){
                        this.actualPlay();\r
                                } else\r
                                if( result & 1 ){\r
-                                       end     = X_AudioWrapper_getEndTime( this );\r
+                                       end     = X_Audio_getEndTime( this );\r
                                        halfway = end < this.duration;\r
                                        this._timerID && X_Timer_remove( this._timerID );\r
                                        \r
@@ -396,7 +404,9 @@ if( X[ 'Pulgin' ][ 'SilverlightEnabled' ] && !X_HTMLAudio ){
        }; */\r
 \r
        X_Audio_BACKENDS.push( {\r
-               backendName : 'Silverlight Audio',\r
+               backendID   : 8,\r
+               \r
+               backendName : 'Silverlight',\r
 \r
                canPlay : {\r
                        'mp3' : true,\r
@@ -408,7 +418,7 @@ if( X[ 'Pulgin' ][ 'SilverlightEnabled' ] && !X_HTMLAudio ){
                        proxy[ 'asyncDispatch' ]( { type : X_EVENT_COMPLETE, canPlay : ext === 'mp3' || ext === 'wma' || ext === 'wav' } );                             \r
                },\r
                \r
-               klass : X_Audio_SLAudioWrapper\r
+               klass : X_SLAudio\r
                \r
        } );\r
 \r