Version 0.6.173, add OS detection to X.UA, fix X.Timer @Chrome & X.Audio.

[pettanr/clientJs.git] / 0.6.x / js / 07_audio / 03_XSilverlightAudio.js

diff --git a/0.6.x/js/07_audio/03_XSilverlightAudio.js b/0.6.x/js/07_audio/03_XSilverlightAudio.js
index 6999b81..30d9548 100644 (file)
--- a/0.6.x/js/07_audio/03_XSilverlightAudio.js
+++ b/0.6.x/js/07_audio/03_XSilverlightAudio.js
@@ -15,7 +15,7 @@
 var X_Audio_SLAudioWrapper,\r
        X_Audio_SLAudio_uid = 0;\r
 \r
-if( X[ 'Pulgin' ][ 'SilverlightEnabled' ] ){\r
+if( X[ 'Pulgin' ][ 'SilverlightEnabled' ] && !X_HTMLAudio ){\r
        \r
        X_TEMP.slaudioInit = function(){\r
                //\r
@@ -342,7 +342,7 @@ if( X[ 'Pulgin' ][ 'SilverlightEnabled' ] ){
                        \r
                        // SilverlightAudio.pause\r
                        actualPause : function(){\r
-                               if( this.error || !this.playing ) return;\r
+                               if( this.error /*  || !this.playing */ ) return;\r
                                \r
                                this._lastUserAction = 'pause';\r
                                this.seekTime = this.getActualCurrentTime();\r
@@ -390,9 +390,10 @@ if( X[ 'Pulgin' ][ 'SilverlightEnabled' ] ){
                }\r
        );\r
 \r
+       /*\r
        function slerror(){\r
                alert( 'slerror' );\r
-       };\r
+       }; */\r
 \r
        X_Audio_BACKENDS.push( {\r
                backendName : 'Silverlight Audio',\r
@@ -404,8 +405,7 @@ if( X[ 'Pulgin' ][ 'SilverlightEnabled' ] ){
                },\r
 \r
                detect : function( proxy, source, ext ){\r
-                       var ok = ext === 'mp3' || ext === 'wma' || ext === 'wav';\r
-                       proxy[ 'asyncDispatch' ]( { type : X_EVENT_COMPLETE, canPlay : ok } );                          \r
+                       proxy[ 'asyncDispatch' ]( { type : X_EVENT_COMPLETE, canPlay : ext === 'mp3' || ext === 'wma' || ext === 'wav' } );                             \r
                },\r
                \r
                klass : X_Audio_SLAudioWrapper\r