X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=0.6.x%2Fjs%2F07_audio%2F10_XAudioSprite.js;h=3b9366e1ad812c9b496f1edcea3522b83285b50f;hb=50462b7b22a3c42bdbf2fb84d782937f817368f4;hp=45caa32ef9200decca53e9e402268624313cd7ad;hpb=0231a4fe0d679b2959968193b0fbeebc44531aaf;p=pettanr%2FclientJs.git

diff --git a/0.6.x/js/07_audio/10_XAudioSprite.js b/0.6.x/js/07_audio/10_XAudioSprite.js
index 45caa32..3b9366e 100644
--- a/0.6.x/js/07_audio/10_XAudioSprite.js
+++ b/0.6.x/js/07_audio/10_XAudioSprite.js
@@ -304,10 +304,22 @@ X_Audio_Sprite_members = {
 		},
 		
 		state : function( uid, opt_obj ){
-			var track = X_Audio_Sprite_TEMP.tracks[ uid ];
+			var track = X_Audio_Sprite_TEMP.tracks[ uid ],
+				state, start, end;
 			// TODO uid = 0
 			if( opt_obj === undefined ){
-				return track ? track.state() : { volume : X_Audio_Sprite_TEMP.volume };
+				// TODO pause
+				if( track ){
+					state = track.state();
+					start = state.startTime;
+					return {
+				    	'currentTime' : state.currentTime - state.startTime,
+				        'playing'     : state.startTime <= state.currentTime && state.currentTime <= state.endTime,
+				        'duration'    : state.endTime - state.startTime,
+				        'volume'      : X_Audio_Sprite_TEMP.volume
+					};
+				};
+				return { 'volume' : X_Audio_Sprite_TEMP.volume, 'playing' : false };
 			};
 			track && track.state( opt_obj );
 			return this;