Version 0.6.172, bugfix...

[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 53f5ed0..0aa4206 100644 (file)
--- a/0.6.x/js/07_audio/10_XAudioSprite.js
+++ b/0.6.x/js/07_audio/10_XAudioSprite.js
@@ -11,8 +11,8 @@ var X_Audio_Sprite_shouldUse        = window.HTMLAudioElement && ( X_UA[ 'iOS' ]
                                                                          false, //X_UA[ 'AndroidChromeBrowser' ],\r
        X_Audio_Sprite_needTouchAndroid = X_UA[ 'AndroidChromeBrowser' ] && !X_Audio_WebAudioWrapper,\r
        X_Audio_Sprite_needTouchFirst   = X_UA[ 'iOS' ] || X_Audio_Sprite_needTouchAndroid || ( X_UA[ 'WinPhone' ] && X_UA[ 'IE9' ] ),\r
-       X_Audio_Sprite_disableMultiTrack = ( X_UA[ 'iOS' ] && !X_Audio_WebAudio_context ) || ( !X_UA[ 'AndroidChromeBrowser' ] && X_UA[ 'AndroidBrowser4' ] ) || ( X_UA[ 'WinPhone' ] && X_UA[ 'IE9' ] ),\r
-       X_Audio_Sprite_enableVolume     = window.HTMLAudioElement && ( !X_UA[ 'iOS' ] && !X_UA[ 'AndroidBrowser' ] && !X_UA[ 'OperaMobile' ] && !X_UA[ 'OperaTablet' ] ), // TODO fennec は　25以上\r
+       X_Audio_Sprite_disableMultiTrack = ( X_UA[ 'iOS' ] && !X_Audio_WebAudio_context ) || ( !X_UA[ 'AndroidChromeBrowser' ] && X_UA[ 'AndroidBrowser4' ] ) || ( X_UA[ 'WinPhone' ] && X_UA[ 'IE' ] < 12 ),\r
+       X_Audio_Sprite_enableVolume     = window.HTMLAudioElement && ( !X_UA[ 'iOS' ] && !X_UA[ 'AndroidBrowser' ] && !X_UA[ 'OperaMobile' ] && !X_UA[ 'OperaTablet' ] ), // TODO fennec は 25以上\r
        // http://tukumemo.com/html5-audio-sp/\r
        // iOS6、Android4.1から同時再生が可能になりました。\r
        X_Audio_Sprite_maxTracks        = X_Audio_Sprite_useVideoForMulti ? 2 : X_Audio_Sprite_disableMultiTrack ? 1 : 9,\r
@@ -256,11 +256,12 @@ X_Audio_Sprite_members = {
                \r
                'seek' : function( uid, position ){\r
                        var track = X_Audio_Sprite_TEMP.tracks[ uid ],\r
-                               end;\r
+                               end, strat;\r
                        if( track ){\r
                                delete track.seekTime;\r
-                               end = X_AudioWrapper_getEndTime( track );\r
-                               position <= end && X_AudioWrapper_getStartTime( track, end ) <= position && track.seek( postion );\r
+                               end   = X_AudioWrapper_getEndTime( track );\r
+                               start = X_AudioWrapper_getStartTime( track, end );\r
+                               0 <= position && position <= ( end - start ) && track.seek( start + position );\r
                        };\r
                        return this;\r
                },\r
@@ -321,7 +322,7 @@ function X_AudioSprite_backendHandler( e ){
                        this[ 'source' ]      = src = e[ 'source' ];\r
                        this[ 'backendName' ] = name = backend.backendName;\r
                \r
-                       console.log( i + ' / ' + X_Audio_Sprite_numTracks );\r
+                       //console.log( i + ' / ' + X_Audio_Sprite_numTracks );\r
                \r
                        for( i = 0; i < X_Audio_Sprite_numTracks; ++i ){\r
                                if( X_Audio_Sprite_useVideo || ( i === 1 && X_Audio_Sprite_useVideoForMulti ) ){\r
@@ -332,8 +333,8 @@ function X_AudioSprite_backendHandler( e ){
                                X_Audio_Sprite_TEMP.tracks.push( last = backend.klass( null, e[ 'source' ], option ) );\r
                                \r
                                \r
-                               console.dir( backend );\r
-                               console.dir( last );\r
+                               //console.dir( backend );\r
+                               //console.dir( last );\r
                        };\r
 \r
                        _e = {\r