Version 0.6.143, fix X.UI.ScrollBox for iOS3.

[pettanr/clientJs.git] / 0.6.x / js / 07_audio / 10_XAudioSprite.js

diff --git a/0.6.x/js/07_audio/10_XAudioSprite.js b/0.6.x/js/07_audio/10_XAudioSprite.js
index 45caa32..99d7782 100644 (file)
--- a/0.6.x/js/07_audio/10_XAudioSprite.js
+++ b/0.6.x/js/07_audio/10_XAudioSprite.js
@@ -130,7 +130,7 @@ X_Audio_Sprite_members = {
                                if( video || ( i === 1 && X_Audio_Sprite_useVideoForMulti ) ){\r
                                        option[ 'useVideo' ] = true;\r
                                };\r
-                               tracks.push( X.Audio( urls, X_Object_clone( option ) ) );\r
+                               tracks.push( X[ 'Audio' ]( urls, X_Object_clone( option ) ) );\r
                        };\r
                        \r
                        tracks[ n - 1 ][ 'listenOnce' ]( [ X_EVENT_BACKEND_READY, X_EVENT_BACKEND_NONE ], this, X_Audio_Sprite_handleEvent );\r
@@ -304,10 +304,22 @@ X_Audio_Sprite_members = {
                },\r
                \r
                state : function( uid, opt_obj ){\r
-                       var track = X_Audio_Sprite_TEMP.tracks[ uid ];\r
+                       var track = X_Audio_Sprite_TEMP.tracks[ uid ],\r
+                               state, start, end;\r
                        // TODO uid = 0\r
                        if( opt_obj === undefined ){\r
-                               return track ? track.state() : { volume : X_Audio_Sprite_TEMP.volume };\r
+                               // TODO pause\r
+                               if( track ){\r
+                                       state = track.state();\r
+                                       start = state.startTime;\r
+                                       return {\r
+                                       'currentTime' : state.currentTime - state.startTime,\r
+                                       'playing'     : state.startTime <= state.currentTime && state.currentTime <= state.endTime,\r
+                                       'duration'    : state.endTime - state.startTime,\r
+                                       'volume'      : X_Audio_Sprite_TEMP.volume\r
+                                       };\r
+                               };\r
+                               return { 'volume' : X_Audio_Sprite_TEMP.volume, 'playing' : false };\r
                        };\r
                        track && track.state( opt_obj );\r
                        return this;\r