OSDN Git Service

Version 0.6.149, fix X.Audio & X.UI.
[pettanr/clientJs.git] / 0.6.x / js / 07_audio / 00_XAudio.js
index 5418dfa..e923109 100644 (file)
@@ -1,5 +1,5 @@
 \r
-X.Audio = {\r
+/*\r
        WebAudio    : 1,\r
        HTML5       : 2,\r
        Flash       : 3,\r
@@ -8,89 +8,212 @@ X.Audio = {
        WMP         : 6,\r
        RealPlayer  : 7,\r
        QuickTime   : 8,\r
-       \r
-       create : function( sourceList, opt_option ){\r
-               return new X_AudioProxy( X.Type.isArray( sourceList ) ? X_Object_cloneArray( sourceList ) : [ sourceList ], opt_option || {} );\r
+ */\r
+\r
+var X_Audio_BACKENDS     = []; // Array.<Hash>\r
+\r
+/*\r
+ * X_EVENT_BACKEND_READY\r
+ * X_EVENT_BACKEND_NONE\r
+ * \r
+ * X_EVENT_READY   再生可能、実際の状態は canplay から loadeddata まで様々、、、\r
+ * X_EVENT_ERROR\r
+ *   1 : ユーザーによってメディアの取得が中断された\r
+ *   2 : ネットワークエラー\r
+ *   3 : メディアのデコードエラー\r
+ *   4 : メディアがサポートされていない\r
+ * \r
+ * X_EVENT_MEDIA_PLAYING 再生中に1秒以下のタイミングで発生.currentTime が取れる?\r
+ * X_EVENT_MEDIA_LOOP    ループ直前に発生、キャンセル可能\r
+ * X_EVENT_MEDIA_LOOPED  ループ時に発生\r
+ * X_EVENT_MEDIA_ENDED   再生位置の(音声の)最後についた\r
+ * X_EVENT_MEDIA_PAUSED  ポーズした\r
+ * X_EVENT_MEDIA_WAITING 再生中に音声が待機状態に。間もなく X_EVENT_MEDIA_PLAYING に移行。\r
+ * X_EVENT_MEDIA_SEEKING シーク中に音声が待機状態に。間もなく X_EVENT_MEDIA_PLAYING に移行。\r
+ */\r
+\r
+// TODO この内容は、AudioBackend の Abstract クラスにする。AudioSprite は Audio ではなく AudioBackend をマネージする\r
+X[ 'Audio' ] = X_EventDispatcher[ 'inherits' ](\r
+       'X.Audio',\r
+       X_Class.POOL_OBJECT,\r
+       {\r
+               'source'      : '',\r
+               'backendName' : '',\r
+               \r
+               'Constructor' : function( sourceList, opt_option ){\r
+                       X_Audio_startDetectionBackend(\r
+                               X_Audio_BACKENDS[ 0 ], this,\r
+                               X_Type_isArray( sourceList ) ? X_Object_cloneArray( sourceList ) : [ sourceList ],\r
+                               opt_option || {} );\r
+                       this[ 'listenOnce' ]( [ X_EVENT_BACKEND_READY, X_EVENT_BACKEND_NONE, X_EVENT_KILL_INSTANCE ], X_Audio_handleEvent );\r
+               },\r
+               \r
+               'play' : function( startTime, endTime, loop, loopStartTime, loopEndTime ){\r
+                       var pair = X_Pair_get( this );\r
+                       pair && pair.play( startTime, endTime, loop, loopStartTime, loopEndTime );\r
+                       return this;\r
+               },\r
+               \r
+               'seek' : function( seekTime ){\r
+                       var pair = X_Pair_get( this );\r
+                       pair && pair.seek( seekTime );\r
+                       return this;\r
+               },\r
+               \r
+               'pause' : function(){\r
+                       var pair = X_Pair_get( this );\r
+                       pair && pair.pause();\r
+                       return this;\r
+               },\r
+               \r
+               'state' : function( obj ){\r
+                       var pair = X_Pair_get( this );\r
+                       if( obj === undefined ){\r
+                               return pair ? pair.getState() :\r
+                                       {\r
+                                       'startTime'     : -1,\r
+                                       'endTime'       : -1,\r
+                                       'loopStartTime' : -1,\r
+                                       'loopEndTime'   : -1,\r
+                                       'currentTime'   : -1,\r
+                                       'loop'          : false,\r
+                                       'looded'        : false,\r
+                                       'error'         : false,\r
+                                       'playing'       : false,\r
+                                       'source'        : this[ 'source' ] || '',\r
+                                       'duration'      : 0\r
+                                       };\r
+                       };\r
+                       pair && pair.setState( obj );\r
+                       return this;\r
+               },              \r
+               \r
+               'loop' : function( v ){\r
+                       var pair = X_Pair_get( this );\r
+                       pair && pair.loop( v );\r
+                       return this;\r
+               },\r
+\r
+               'volume' : function( v ){\r
+                       var pair = X_Pair_get( this );\r
+                       pair && pair.volume( v );\r
+                       return this;\r
+               },\r
+\r
+               'currentTime' : function( v ){\r
+                       var pair = X_Pair_get( this );\r
+                       pair && pair.currentTime( v );\r
+                       return this;\r
+               },\r
+\r
+               'isPlaying' : function(){\r
+                       var pair = X_Pair_get( this );\r
+                       return pair && pair.playing;\r
+               }\r
+               \r
        }\r
+);\r
+\r
+function X_Audio_handleEvent( e ){\r
+       var backend;\r
+       \r
+       switch( e.type ){\r
+               case X_EVENT_BACKEND_READY :\r
+                       backend = X_Audio_BACKENDS[ e[ 'backendID' ] ];\r
+               \r
+                       this[ 'unlisten' ]( X_EVENT_BACKEND_NONE, X_Audio_handleEvent );\r
+                       this[ 'source' ]      = e[ 'source' ];\r
+                       this[ 'backendName' ] = backend.backendName;\r
+                       X_Pair_create( this, backend.klass( this, e[ 'source' ], e[ 'option' ] ) );\r
+                       break;\r
+               \r
+               case X_EVENT_BACKEND_NONE :\r
+                       this[ 'kill' ]();\r
+                       break;\r
+               \r
+               case X_EVENT_KILL_INSTANCE :\r
+                       backend = X_Pair_get( this );\r
+                       backend && backend[ 'kill' ]();\r
+                       X_Pair_release( this, backend );\r
+                       break;\r
+       };\r
 };\r
 \r
-var X_Audio_BACKENDS = [],\r
-       X_Audio_WRAPPER_LIST = [];\r
 \r
 /*\r
  * TODO preplayerror play してみたら error が出た、backend の変更。\r
  */\r
 \r
-function X_Audio_detectBackend( proxy, sourceList, option ){\r
-       var source  = sourceList.shift() || '', \r
-               parts   = X_URL_cleanup( source ).split( '.' ),\r
-               ext     = parts[ parts.length - 1 ],\r
-               backend = X_Audio_BACKENDS[ 0 ],\r
-               ext, sup;\r
+function X_Audio_startDetectionBackend( backend, xaudio, sourceList, option ){\r
+       var source = sourceList[ 0 ] || '', \r
+               ext    = X_URL_getEXT( source ),\r
+               sup;\r
        \r
        if( source && backend ){\r
-               sup      = [ proxy, option, sourceList, source, ext ];\r
+               sup      = [ xaudio, sourceList, option, source, ext ];\r
                sup[ 5 ] = sup;\r
                \r
-               proxy.listenOnce( [ 'support', 'nosupport' ], backend, X_Audio_detectComplete, sup );\r
-               backend.detect( proxy, source, ext );   \r
+               xaudio[ 'listenOnce' ]( X_EVENT_COMPLETE, backend, X_Audio_onEndedDetection, sup );\r
+               backend.detect( xaudio, source, ext );\r
        } else {\r
-               proxy.asyncDispatch( 'nobackend' );\r
+               xaudio[ 'asyncDispatch' ]( X_EVENT_BACKEND_NONE );\r
        };\r
 };\r
 \r
-function X_Audio_detectComplete( e, proxy, option, sourceList, source, ext, sup ){\r
+function X_Audio_onEndedDetection( e, xaudio, sourceList, option, source, ext, sup ){\r
        var i = X_Audio_BACKENDS.indexOf( this ), backend;\r
        \r
-       proxy.unlisten( [ 'support', 'nosupport' ], backend, X_Audio_detectComplete, sup );\r
-       \r
-       switch( e.type ){\r
-               case 'support' :\r
-                       proxy._backend = i;\r
-                       proxy.asyncDispatch( { type : 'backendfound', option : option, source : source } );\r
-                       break;\r
-               case 'nosupport' :\r
-                       if( backend = X_Audio_BACKENDS[ i + 1 ] ){\r
-                               proxy.listenOnce( [ 'support', 'nosupport' ], backend, X_Audio_detectComplete, sup );\r
-                               backend.detect( proxy, source, ext );\r
-                       } else\r
-                       if( sourceList.length ){\r
-                               X_Audio_detectBackend( proxy, sourceList, option );\r
-                       } else {\r
-                               proxy.asyncDispatch( 'nobackend' );\r
-                       };\r
-                       break;\r
+       if( e.canPlay ){\r
+               xaudio._backend = i;\r
+               xaudio[ 'asyncDispatch' ]( {\r
+                       type          : X_EVENT_BACKEND_READY,\r
+                       'option'      : option,\r
+                       'source'      : source,\r
+                       'backendName' : this[ 'backendName' ],\r
+                       'backendID'   : i\r
+               } );                    \r
+       } else {\r
+               console.log( 'No ' + source + ' ' + this[ 'backendName' ] );\r
+               if( sup[ 3 ] = source = sourceList[ sourceList.indexOf( source ) + 1 ] ){\r
+                       sup[ 4 ] = ext    = X_URL_getEXT( source );\r
+                       xaudio[ 'listenOnce' ]( X_EVENT_COMPLETE, this, X_Audio_onEndedDetection, sup );\r
+                       this.detect( xaudio, source, ext );\r
+               } else\r
+               if( backend = X_Audio_BACKENDS[ i + 1 ] ){\r
+                       X_Audio_startDetectionBackend( backend, xaudio, sourceList, option );\r
+               } else {\r
+                       xaudio[ 'asyncDispatch' ]( X_EVENT_BACKEND_NONE );\r
+               };                              \r
        };\r
 };\r
 \r
-function X_AudioProxy_getAudioWrapper( proxy ){\r
-       var i = X_Audio_WRAPPER_LIST.length;\r
-       for( ; i; ){\r
-               if( X_Audio_WRAPPER_LIST[ --i ].proxy === proxy ) return X_Audio_WRAPPER_LIST[ i ];\r
-       };\r
-};\r
 \r
-var X_AudioProxy = X.EventDispatcher.inherits(\r
-       'X.AV.AudioProxy',\r
-       X.Class.POOL_OBJECT,\r
+\r
+var X_Audio_AbstractAudioBackend = X_EventDispatcher[ 'inherits' ](\r
+       'X.AbstractAudioBackend',\r
+       X_Class.ABSTRACT,\r
        {\r
-               source      : '',\r
-               backendName : '',\r
-               _backend    : -1,\r
                \r
-               Constructor : function( sourceList, option ){\r
-                       X_Audio_detectBackend( this, sourceList, option );\r
-                       this.listenOnce( [ 'backendfound', 'nobackend', X.Event.KILL_INSTANCE ], X_AudioProxy_handleEvent );\r
-               },\r
+               url           : '',\r
+               target        : null,\r
                \r
-               close : function(){\r
-                       return this._backend !== -1 && X_AudioProxy_getAudioWrapper( this ).close();\r
-               },\r
+               startTime     : 0,\r
+               endTime       : -1,\r
+               loopStartTime : -1,\r
+               loopEndTime   : -1,\r
+               seekTime      : -1,\r
+               duration      : 0,\r
+\r
+               playing       : false,\r
+               error         : 0,                      \r
+               autoLoop      : false,\r
+               looped        : false,\r
+               autoplay      : false,\r
+               gain          : 0.5,\r
                \r
                play : function( startTime, endTime, loop, loopStartTime, loopEndTime ){\r
-                       var state, duration;\r
                        if( 0 <= startTime ){\r
-                               this.state( {\r
+                               this.setState( {\r
                                        currentTime   : startTime,\r
                                        startTime     : startTime,\r
                                        endTime       : endTime,\r
@@ -99,181 +222,183 @@ var X_AudioProxy = X.EventDispatcher.inherits(
                                        loopEndTime   : loopEndTime\r
                                } );\r
                        };\r
-                       this._backend !== -1 && X_AudioProxy_getAudioWrapper( this ).play();\r
-                       return this;\r
+                       this.actualPlay();\r
                },\r
                \r
                seek : function( seekTime ){\r
-                       var state = this.state(),\r
-                               end   = X_AudioWrapper_getEndTime( X_AudioProxy_getAudioWrapper( this ) );\r
-                       if( seekTime < end ){\r
-                               this.state( { currentTime : seekTime } );\r
+                       if( seekTime < X_AudioWrapper_getEndTime( this ) ){\r
+                               this.setState( { currentTime : seekTime } );\r
                        };\r
-                       return this;\r
                },\r
                \r
                pause : function(){\r
-                       this.state().playing && X_AudioProxy_getAudioWrapper( this ).pause();\r
-                       return this;\r
-               },\r
-               \r
-               state : function( obj ){\r
-                       var backend = this._backend !== -1 && X_AudioProxy_getAudioWrapper( this );\r
-\r
-                       if( obj === undefined ){\r
-                               return backend ?\r
-                                       backend.state() :\r
-                                       {\r
-                                       startTime     : -1,\r
-                                       endTime       : -1,\r
-                                       loopStartTime : -1,\r
-                                       loopEndTime   : -1,\r
-                                       currentTime   : -1,\r
-                                       loop          : false,\r
-                                       looded        : false,\r
-                                       error         : false,\r
-                                       playing       : false,\r
-                                       \r
-                                       source        : this.source || '',\r
-                                       duration      : 0\r
-                                       };\r
-                       };\r
-                       backend && backend.state( obj );\r
-                       return this;\r
+                       this.playing && this.actualPause();\r
                },              \r
                \r
                loop : function( v ){\r
-                       var backend = this._backend !== -1 && X_AudioProxy_getAudioWrapper( this );\r
                        if( v === undefined ){\r
-                               return backend && backend.state().loop;\r
+                               return this.autoLoop;\r
                        };\r
-                       backend && backend.state( { loop : v } );\r
-                       return this;\r
+                       this.setState( { loop : v } );\r
                },\r
 \r
                volume : function( v ){\r
-                       var backend = this._backend !== -1 && X_AudioProxy_getAudioWrapper( this );\r
                        if( v === undefined ){\r
-                               return backend && backend.state().volume;\r
+                               return this.gain;\r
                        };\r
-                       backend && backend.state( { volume : v } );\r
-                       return this;\r
+                       this.setState( { volume : v } );\r
                },\r
 \r
                currentTime : function( v ){\r
-                       var backend = this._backend !== -1 && X_AudioProxy_getAudioWrapper( this );\r
                        if( v === undefined ){\r
-                               return backend && backend.state().currentTime;\r
+                               return this.playing ? this.getActualCurrentTime() : this.seekTime;\r
                        };\r
-                       backend && backend.state( { currentTime : v } );\r
-                       return this;\r
+                       this.setState( { currentTime : v } );\r
                },\r
-\r
-               isPlaying : function(){\r
-                       return this._backend !== -1 && X_AudioProxy_getAudioWrapper( this ).state().playing;\r
-               }\r
-               \r
-       }\r
-);\r
-\r
-function X_AudioProxy_handleEvent( e ){\r
-       switch( e.type ){\r
-               case 'backendfound' :\r
-                       this.unlisten( 'nobackend', X_AudioProxy_handleEvent );\r
-                       this.source = e.source;\r
-                       this.backendName = X_Audio_BACKENDS[ this._backend ].backendName;\r
-                       X_Audio_WRAPPER_LIST.push( new X_Audio_BACKENDS[ this._backend ].klass( this, e.source, e.option ) );\r
-                       break;\r
                \r
-               case 'nobackend' :\r
-                       this.kill();\r
-                       break;\r
+               getState : function(){\r
+                       \r
+                   return {\r
+                       'startTime'     : this.startTime,\r
+                       'endTime'       : this.endTime < 0 ? this.duration : this.endTime,\r
+                       'loopStartTime' : this.loopStartTime < 0 ? this.startTime : this.loopStartTime,\r
+                       'loopEndTime'   : this.loopEndTime < 0 ? ( this.endTime || this.duration ) : this.loopEndTime,\r
+                       'loop'          : this.autoLoop,\r
+                       'looped'        : this.looped,\r
+                       'volume'        : this.gain,\r
+                       'playing'       : this.playing,                         \r
+                       'duration'      : this.duration,\r
+                       \r
+                       'currentTime'  : this.playing ? this.getActualCurrentTime() : this.seekTime,\r
+                       'error'        : this.getActualError ? this.getActualError() : this.error\r
+                   };\r
+               },\r
                \r
-               case X.Event.KILL_INSTANCE :\r
-                       this.close();\r
-                       break;\r
-       };\r
-};\r
-\r
-function X_AudioWrapper_updateStates( audioWrapper, obj ){\r
-       var playing = audioWrapper.playing,\r
-               k, v,\r
-               end = 0, seek = 0, volume = 0;\r
-       \r
-       for( k in obj ){\r
-               v = obj[ k ];\r
-               switch( k ){\r
-                       case 'currentTime' :\r
-                               v = X_AudioWrapper_timeStringToNumber( v );\r
-                               if( X.Type.isNumber( v ) ){\r
-                                       if( playing ){\r
-                                               if( audioWrapper.state().currentTime !== v ){\r
-                                                       audioWrapper.seekTime = v;\r
-                                                       seek = 2;\r
+               setState : function( obj ){\r
+                       var playing = this.playing,\r
+                               k, v,\r
+                               end = 0, seek = 0, volume = 0;\r
+                       \r
+                       for( k in obj ){\r
+                               v = obj[ k ];\r
+                               switch( k ){\r
+                                       case 'currentTime' :\r
+                                               v = X_AudioWrapper_timeStringToNumber( v );\r
+                                               if( X_Type_isNumber( v ) ){\r
+                                                       if( playing ){\r
+                                                               if( this.getActualCurrentTime() !== v ){\r
+                                                                       seek = 2;\r
+                                                                       this.seekTime = v;\r
+                                                               };                                                              \r
+                                                       } else {\r
+                                                               this.seekTime = v;\r
+                                                       };\r
+                                               } else {\r
+                                                       continue;\r
                                                };\r
-                                       } else {\r
-                                               audioWrapper.seekTime = v;\r
-                                       };\r
-                               } else {\r
-                                       continue;\r
-                               };\r
-                               break;\r
+                                               break;\r
+                                                       \r
+                                       case 'startTime'     :\r
+                                               v = X_AudioWrapper_timeStringToNumber( v );\r
+                                               if( v || v === 0 ){\r
+                                                       if( this.startTime !== v ){\r
+                                                               this.startTime = v;                                     \r
+                                                       };\r
+                                               } else {\r
+                                                       delete this.startTime;\r
+                                               };\r
+                                               break;\r
                                        \r
-                       case 'startTime'     :\r
-                       case 'endTime'       :\r
-                       case 'loopStartTime' :\r
-                       case 'loopEndTime'   :\r
-                               v = X_AudioWrapper_timeStringToNumber( v );\r
-                               console.log( k + ' ' + v );\r
-                               if( v || v === 0 ){\r
-                                       if( audioWrapper[ k ] !== v ){\r
-                                               audioWrapper[ k ] = v;\r
+                                       case 'endTime'       :\r
+                                               v = X_AudioWrapper_timeStringToNumber( v );\r
+                                               if( v || v === 0 ){\r
+                                                       if( this.endTime !== v ){\r
+                                                               this.endTime = v;\r
+                                                               if( playing ) end = 1;                                          \r
+                                                       };\r
+                                               } else {\r
+                                                       delete this.endTime;\r
+                                                       if( playing ) end = 1;\r
+                                               };\r
+                                               break;\r
                                                \r
-                                               // 再生中の endTime の変更\r
-                                               if( playing && ( k === 'endTime' || k === 'loopEndTime' ) ) end = 1;                                            \r
-                                       };\r
-                               } else {\r
-                                       delete audioWrapper[ k ];\r
-                                       if( playing && ( k === 'endTime' || k === 'loopEndTime' ) ) end = 1;\r
-                               };\r
-                               break;\r
-\r
-                       case 'loop' :\r
-                       case 'looped' :\r
-                               if( X.Type.isBoolean( v ) && audioWrapper[ k ] !== v ){\r
-                                       audioWrapper[ k ] = v;\r
+                                       case 'loopStartTime' :\r
+                                               v = X_AudioWrapper_timeStringToNumber( v );\r
+                                               if( v || v === 0 ){\r
+                                                       if( this.loopStartTime !== v ){\r
+                                                               this.loopStartTime = v;                                 \r
+                                                       };\r
+                                               } else {\r
+                                                       delete this.loopStartTime;\r
+                                               };\r
+                                               break;\r
+                                               \r
+                                       case 'loopEndTime'   :\r
+                                               v = X_AudioWrapper_timeStringToNumber( v );\r
+                                               if( v || v === 0 ){\r
+                                                       if( this.loopEndTime !== v ){\r
+                                                               this.loopEndTime = v;\r
+                                                               if( playing ) end = 1;                                          \r
+                                                       };\r
+                                               } else {\r
+                                                       delete this.loopEndTime;\r
+                                                       if( playing ) end = 1;\r
+                                               };\r
+                                               break;\r
+               \r
+                                       case 'looped' :\r
+                                               if( X_Type_isBoolean( v ) && this.looped !== v ){\r
+                                                       this.looped = v;\r
+                                                       if( playing ) seek = 2;\r
+                                               };\r
+                                               break;\r
+                                               \r
+                                       case 'loop' :\r
+                                               if( X_Type_isBoolean( v ) && this.autoLoop !== v ){\r
+                                                       this.autoLoop = v;\r
+                                               };\r
+                                               break;\r
+                                               \r
+                                       case 'autoplay' :\r
+                                               if( X_Type_isBoolean( v ) && this.autoplay !== v ){\r
+                                                       this.autoplay = v;\r
+                                               };\r
+                                               break;\r
+               \r
+                                       case 'volume' :\r
+                                               if( X_Type_isNumber( v ) ){\r
+                                                       v = v < 0 ? 0 : 1 < v ? 1 : v;\r
+                                                       if( this.gain !== v ){\r
+                                                               this.gain = v;\r
+                                                               // if playing -> update\r
+                                                               if( playing ) volume = 4;\r
+                                                       };\r
+                                               };\r
+                                               break;\r
                                };\r
-                               break;\r
+                       };\r
+                       \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
+                               //this.duration < this.endTime\r
+                       ){\r
+                               console.log( 'setState 0:' + this.startTime + ' -> ' + this.endTime + ' d:' + this.duration + ' 1:' + this.loopStartTime + ' -> ' + this.loopEndTime );\r
+                               return;\r
+                       };\r
+                       \r
+                       v = end + seek + volume;\r
+                       return v && this.afterUpdateState( v );         \r
+               }\r
+               \r
+       }\r
+);\r
 \r
-                       case 'volume' :\r
-                               if( X.Type.isNumber( v ) ){\r
-                                       v = v < 0 ? 0 : 1 < v ? 1 : v;\r
-                                       if( audioWrapper[ k ] !== v ){\r
-                                               audioWrapper[ k ] = v;\r
-                                               // if playing -> update\r
-                                               if( playing ) volume = 4;\r
-                                       };\r
-                               };\r
-                               break;\r
-               };\r
-       };\r
-       \r
-       if( audioWrapper.endTime < audioWrapper.startTime ||\r
-               ( audioWrapper.loopEndTime < 0 ? audioWrapper.endTime : audioWrapper.loopEndTime ) < ( audioWrapper.loopStartTime < 0 ? audioWrapper.startTime : audioWrapper.loopStartTime ) ||\r
-               X_AudioWrapper_getEndTime( audioWrapper ) < audioWrapper.seekTime// ||\r
-               //audioWrapper.duration < audioWrapper.endTime\r
-       ){\r
-               //alert( 'error @updateStateObject() begin:' + audioWrapper.startTime + ' end:' + audioWrapper.endTime + ' d:' + audioWrapper.duration + ' ls:' + audioWrapper.loopStartTime );\r
-               return 0;\r
-       };\r
-       \r
-       return end + seek + volume;\r
-};\r
 \r
 function X_AudioWrapper_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
+       if( X_Type_isNumber( time ) ) return time;\r
+       if( !X_Type_isString( time ) || !time.length ) return;\r
 \r
        ary = time.split( '.' );\r
        ms  = parseInt( ( ary[ 1 ] + '000' ).substr( 0, 3 ) ) || 0;\r