The branch, dharma-pre has been updated
       via  e4fe861350648e4d8c3ab2a15235b5bdaf38aec1 (commit)
      from  7cfb931764106c5be722e3825966da3bf85483b5 (commit)

- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=e4fe861350648e4d8c3ab2a15235b5bdaf38aec1

commit e4fe861350648e4d8c3ab2a15235b5bdaf38aec1
Author: amet <a...@nospam>
Date:   Wed Oct 20 12:46:07 2010 +0400

    [script.xbmc.audio.mixer] -v 1.0.3

diff --git a/script.xbmc.audio.mixer/addon.xml 
b/script.xbmc.audio.mixer/addon.xml
index f34745c..a86a357 100644
--- a/script.xbmc.audio.mixer/addon.xml
+++ b/script.xbmc.audio.mixer/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="script.xbmc.audio.mixer"
        name="XBMC Audio Mixer"
-       version="1.0.2"
+       version="1.0.3"
        provider-name="Team XBMC">
   <requires>
     <import addon="xbmc.python" version="1.0"/>
diff --git a/script.xbmc.audio.mixer/resources/lib/alsaMixerCore.py 
b/script.xbmc.audio.mixer/resources/lib/alsaMixerCore.py
index 6a3c52f..32a08ea 100644
--- a/script.xbmc.audio.mixer/resources/lib/alsaMixerCore.py
+++ b/script.xbmc.audio.mixer/resources/lib/alsaMixerCore.py
@@ -156,9 +156,11 @@ class alsaMixerCore:
                        if nameStart>0:
                                stdErr, stdOut, retValue = 
self.__runSilent("amixer sget " + mixername)
                                if stdOut.find("pvolume") > 0:
-                                       if not stdOut.find("cvolume") > 0:
+                                       if not stdOut.find("cvolume") > 0 and 
not stdOut.find("cswitch") > 0:
                                                hasVol=True
-                               if stdOut.find("pswitch") > 0:
+                                               if stdOut.find("pswitch") > 0:
+                                                       hasSw = True
+                               elif stdOut.find("pswitch") > 0:
                                        if not stdOut.find("cswitch") > 0:
                                                hasSw = True
                                if hasVol or hasSw:

-----------------------------------------------------------------------

Summary of changes:
 script.xbmc.audio.mixer/addon.xml                  |    2 +-
 .../resources/lib/alsaMixerCore.py                 |    6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Scripts

------------------------------------------------------------------------------
Download new Adobe(R) Flash(R) Builder(TM) 4
The new Adobe(R) Flex(R) 4 and Flash(R) Builder(TM) 4 (formerly 
Flex(R) Builder(TM)) enable the development of rich applications that run
across multiple browsers and platforms. Download your free trials today!
http://p.sf.net/sfu/adobe-dev2dev
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons

Reply via email to