[tuxdroid-svn] r5109 - software_suite_v3/software/plugin/plugin-skype/trunk/executables

[remi <c2m...@c2...>]

Author: remi
Date: 2009-07-14 11:10:22 +0200 (Tue, 14 Jul 2009)
New Revision: 5109

Modified:
   software_suite_v3/software/plugin/plugin-skype/trunk/executables/plugin-skype.py
Log:
* Now uses the new functions from the module "Device"

Modified: software_suite_v3/software/plugin/plugin-skype/trunk/executables/plugin-skype.py
===================================================================
--- software_suite_v3/software/plugin/plugin-skype/trunk/executables/plugin-skype.py	2009-07-14 09:09:09 UTC (rev 5108)
+++ software_suite_v3/software/plugin/plugin-skype/trunk/executables/plugin-skype.py	2009-07-14 09:10:22 UTC (rev 5109)
@@ -24,6 +24,7 @@
 from util.SimplePlugin.SimplePluginConfiguration import SimplePluginConfiguration
 from util.SimplePlugin.SimplePlugin import SimplePlugin
 from util.system.TaskBar import refreshTaskBar
+from util.system.Device import *
 
 class Configuration(SimplePluginConfiguration):
     """This class make an access to the plugin parameters.
@@ -192,15 +193,13 @@
         """Set tux as audio peripheral.
         """
         if os.name == "nt":
-            import platform
-            if int(platform.version().split(".")[0]) >= 6:
-                self.__sendCommandToSkype('SET AUDIO_IN TuxDroid-Micro (TuxDroid-Audio)')
-                self.__sendCommandToSkype('SET AUDIO_OUT Speakers (TuxDroid-Audio)')
-                self.__sendCommandToSkype('SET RINGER Speakers (TuxDroid-Audio)')
-            else:
-                self.__sendCommandToSkype('SET AUDIO_IN TuxDroid-Audio')
-                self.__sendCommandToSkype('SET AUDIO_OUT TuxDroid-Audio')
-                self.__sendCommandToSkype('SET RINGER TuxDroid-Audio')
+            audioIn = Device.getSoundDeviceNameTuxdroidMicro()
+            audioOut = Device.getSoundDeviceNameTuxdroidAudio()
+            if audioOut == None:
+                return
+            self.__sendCommandToSkype('SET AUDIO_IN %s' % audioIn)
+            self.__sendCommandToSkype('SET AUDIO_OUT %s' % audioOut)
+            self.__sendCommandToSkype('SET RINGER %s' % audioOut)
         else:
             self.__sendCommandToSkype('SET AUDIO_IN TuxDroid (plughw:TuxDroid,0)')
             self.__sendCommandToSkype('SET AUDIO_OUT TuxDroid (plughw:TuxDroid,0)')