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

[pettanr/clientJs.git] / 0.6.x / js / 07_audio / 00_XAudio.js

diff --git a/0.6.x/js/07_audio/00_XAudio.js b/0.6.x/js/07_audio/00_XAudio.js
index 584755e..33faebf 100644 (file)
--- a/0.6.x/js/07_audio/00_XAudio.js
+++ b/0.6.x/js/07_audio/00_XAudio.js
@@ -1,7 +1,7 @@
 \r
 /*\r
        WebAudio    : 1,\r
-       HTML5       : 2,\r
+       HTMLAudio   : 2,\r
        Flash       : 3,\r
        Silverlight : 4,\r
        Unity       : 5,\r
@@ -15,9 +15,12 @@ var X_Audio_BACKENDS     = []; // Array.<Hash>
 X_TEMP.onSystemReady.push(\r
        function(){\r
                var canPlay = X[ 'Audio' ][ 'canPlay' ] = {},\r
-                       i = X_Audio_BACKENDS.length;\r
+                       i = X_Audio_BACKENDS.length,\r
+                       be;\r
                for( ; i; ){\r
-                       X_Object_override( canPlay, X_Audio_BACKENDS[ --i ].canPlay );\r
+                       be = X_Audio_BACKENDS[ --i ];\r
+                       X_Object_override( canPlay, be.canPlay );\r
+                       X[ 'Audio' ][ be.backendName ] = be.backendID;\r
                };\r
        });\r
 \r
@@ -42,8 +45,8 @@ X_TEMP.onSystemReady.push(
  * <dt>X.Event.MEDIA_LOOPED  <dd>ループ時に発生\r
  * <dt>X.Event.MEDIA_ENDED   <dd>再生位置の(音声の)最後についた\r
  * <dt>X.Event.MEDIA_PAUSED  <dd>ポーズした\r
- * <dt>X.Event.MEDIA_WAITING <dd>再生中に音声が待機状態に。間もなく X.Event.MEDIA_PLAYING に移行。\r
- * <dt>X.Event.MEDIA_SEEKING <dd>シーク中に音声が待機状態に。間もなく X.Event.MEDIA_PLAYING に移行。\r
+ * <dt>X.Event.MEDIA_WAITING <dd>再生中に音声が待機状態に。\r
+ * <dt>X.Event.MEDIA_SEEKING <dd>シーク中に音声が待機状態に。\r
  * </dl>\r
  * \r
  * @alias X.Audio\r
@@ -246,26 +249,25 @@ function X_Audio_onEndedDetection( e, xaudio, sourceList, option, source, ext, s
 \r
 \r
 \r
-var X_Audio_AbstractAudioBackend = X_EventDispatcher[ 'inherits' ](\r
-       'X.AbstractAudioBackend',\r
+var X_AudioBase = X_EventDispatcher[ 'inherits' ](\r
+       'X.AudioBase',\r
        X_Class.ABSTRACT,\r
        {\r
+               url           : '',   //\r
+               target        : null, //\r
                \r
-               url           : '',\r
-               target        : null,\r
-               \r
-               startTime     : 0,\r
-               endTime       : -1,\r
+               startTime     : 0,    //\r
+               endTime       : -1,   //\r
                loopStartTime : -1,\r
                loopEndTime   : -1,\r
                seekTime      : -1,\r
-               duration      : 0,\r
+               duration      : 0,    //\r
 \r
                playing       : false,\r
-               error         : 0,                      \r
+               error         : 0,    //                \r
                autoLoop      : false,\r
                looped        : false,\r
-               autoplay      : false,\r
+               autoplay      : false,//\r
                gain          : 0.5,\r
                \r
                play : function( startTime, endTime, loop, loopStartTime, loopEndTime ){\r
@@ -280,17 +282,20 @@ var X_Audio_AbstractAudioBackend = X_EventDispatcher[ 'inherits' ](
                                        'loopEndTime'   : loopEndTime\r
                                } );\r
                        };\r
+                       // canPlay() : autoplay = true\r
                        this.actualPlay();\r
                },\r
                \r
                seek : function( seekTime ){\r
-                       if( seekTime < X_AudioWrapper_getEndTime( this ) ){\r
+                       if( seekTime < X_Audio_getEndTime( this ) ){\r
                                this.setState( { 'currentTime' : seekTime } );\r
                        };\r
                },\r
                \r
                pause : function(){\r
                        this.playing && this.actualPause();\r
+                       // delete this.autoplay\r
+                       // delete this.playing\r
                },              \r
                \r
                loop : function( v ){\r
@@ -341,7 +346,7 @@ var X_Audio_AbstractAudioBackend = X_EventDispatcher[ 'inherits' ](
                                v = obj[ k ];\r
                                switch( k ){\r
                                        case 'currentTime' :\r
-                                               v = X_AudioWrapper_timeStringToNumber( v );\r
+                                               v = X_Audio_timeStringToNumber( v );\r
                                                if( X_Type_isNumber( v ) ){\r
                                                        if( playing ){\r
                                                                if( this.getActualCurrentTime() !== v ){\r
@@ -357,7 +362,7 @@ var X_Audio_AbstractAudioBackend = X_EventDispatcher[ 'inherits' ](
                                                break;\r
                                                        \r
                                        case 'startTime'     :\r
-                                               v = X_AudioWrapper_timeStringToNumber( v );\r
+                                               v = X_Audio_timeStringToNumber( v );\r
                                                if( v || v === 0 ){\r
                                                        if( this.startTime !== v ){\r
                                                                this.startTime = v;                                     \r
@@ -368,7 +373,7 @@ var X_Audio_AbstractAudioBackend = X_EventDispatcher[ 'inherits' ](
                                                break;\r
                                        \r
                                        case 'endTime'       :\r
-                                               v = X_AudioWrapper_timeStringToNumber( v );\r
+                                               v = X_Audio_timeStringToNumber( v );\r
                                                if( v || v === 0 ){\r
                                                        if( this.endTime !== v ){\r
                                                                this.endTime = v;\r
@@ -381,7 +386,7 @@ var X_Audio_AbstractAudioBackend = X_EventDispatcher[ 'inherits' ](
                                                break;\r
                                                \r
                                        case 'loopStartTime' :\r
-                                               v = X_AudioWrapper_timeStringToNumber( v );\r
+                                               v = X_Audio_timeStringToNumber( v );\r
                                                if( v || v === 0 ){\r
                                                        if( this.loopStartTime !== v ){\r
                                                                this.loopStartTime = v;                                 \r
@@ -392,7 +397,7 @@ var X_Audio_AbstractAudioBackend = X_EventDispatcher[ 'inherits' ](
                                                break;\r
                                                \r
                                        case 'loopEndTime'   :\r
-                                               v = X_AudioWrapper_timeStringToNumber( v );\r
+                                               v = X_Audio_timeStringToNumber( v );\r
                                                if( v || v === 0 ){\r
                                                        if( this.loopEndTime !== v ){\r
                                                                this.loopEndTime = v;\r
@@ -442,7 +447,7 @@ var X_Audio_AbstractAudioBackend = X_EventDispatcher[ 'inherits' ](
                        \r
                        if( this.endTime < this.startTime ||\r
                                ( this.loopEndTime < 0 ? this.endTime : this.loopEndTime ) < ( this.loopStartTime < 0 ? this.startTime : this.loopStartTime ) ||\r
-                               X_AudioWrapper_getEndTime( this ) < this.seekTime// ||\r
+                               X_Audio_getEndTime( this ) < this.seekTime// ||\r
                                //this.duration < this.endTime\r
                        ){\r
                                console.log( 'setState 0:' + this.startTime + ' -> ' + this.endTime + ' looped:' + this.looped + ' 1:' + this.loopStartTime + ' -> ' + this.loopEndTime );\r
@@ -450,14 +455,14 @@ var X_Audio_AbstractAudioBackend = X_EventDispatcher[ 'inherits' ](
                        };\r
                        \r
                        v = end + seek + volume;\r
-                       return v && this.afterUpdateState( v );         \r
+                       return v && this.playing && this.afterUpdateState( v );\r
                }\r
                \r
        }\r
 );\r
 \r
 \r
-function X_AudioWrapper_timeStringToNumber( time ){\r
+function X_Audio_timeStringToNumber( time ){\r
        var ary, ms, s = 0, m = 0, h = 0;\r
        if( X_Type_isNumber( time ) ) return time;\r
        if( !X_Type_isString( time ) || !time.length ) return;\r
@@ -493,7 +498,7 @@ function X_AudioWrapper_timeStringToNumber( time ){
        return ms < 0 ? 0 : ms;\r
 };\r
 \r
-function X_AudioWrapper_getStartTime( audioWrapper, endTime, delSeekTime ){\r
+function X_Audio_getStartTime( audioWrapper, endTime, delSeekTime ){\r
        var seek = audioWrapper.seekTime;\r
        \r
        if( delSeekTime ) delete audioWrapper.seekTime;\r
@@ -512,7 +517,7 @@ function X_AudioWrapper_getStartTime( audioWrapper, endTime, delSeekTime ){
        return audioWrapper.startTime;\r
 };\r
 \r
-function X_AudioWrapper_getEndTime( audioWrapper ){\r
+function X_Audio_getEndTime( audioWrapper ){\r
        var duration = audioWrapper.duration;\r
        \r
        if( audioWrapper.looped && 0 <= audioWrapper.loopEndTime ){\r