Author: duncan
Date: Fri Sep 22 08:40:40 2006
New Revision: 8225

Modified:
   branches/rel-1-5/freevo/src/plugins/joy.py
   branches/rel-1-5/freevo/src/plugins/mixer.py
   branches/rel-1-5/freevo/src/plugins/ossmixer.py

Log:
[ 1563365 ] Failing to get mixer by name
Patch applied.


Modified: branches/rel-1-5/freevo/src/plugins/joy.py
==============================================================================
--- branches/rel-1-5/freevo/src/plugins/joy.py  (original)
+++ branches/rel-1-5/freevo/src/plugins/joy.py  Fri Sep 22 08:40:40 2006
@@ -55,7 +55,6 @@
 class PluginInterface(plugin.DaemonPlugin):
 
     def __init__(self):
-        self.plugin_name = 'JOY'
         self.device_name = ''
      
         if config.JOY_DEV == 0:
@@ -82,6 +81,7 @@
 
         # ok, joystick is working
         plugin.DaemonPlugin.__init__(self)
+        self.plugin_name = 'JOY'
         
         print 'using joystick', config.JOY_DEV
         

Modified: branches/rel-1-5/freevo/src/plugins/mixer.py
==============================================================================
--- branches/rel-1-5/freevo/src/plugins/mixer.py        (original)
+++ branches/rel-1-5/freevo/src/plugins/mixer.py        Fri Sep 22 08:40:40 2006
@@ -73,7 +73,6 @@
     SOUND_MASK_LINE = 64
     
     def __init__(self):
-        self.plugin_name = 'MIXER'
         self.mixfd = None
         self.muted = 0
         
@@ -87,6 +86,7 @@
                 return
         # init here
         plugin.DaemonPlugin.__init__(self)
+        self.plugin_name = 'MIXER'
 
         if 0:
             self.mainVolume   = 0

Modified: branches/rel-1-5/freevo/src/plugins/ossmixer.py
==============================================================================
--- branches/rel-1-5/freevo/src/plugins/ossmixer.py     (original)
+++ branches/rel-1-5/freevo/src/plugins/ossmixer.py     Fri Sep 22 08:40:40 2006
@@ -75,7 +75,6 @@
     SOUND_MASK_LINE = 64
     
     def __init__(self):
-        self.plugin_name = 'MIXER'
         self.mixfd = None
         self.muted = 0
         
@@ -90,6 +89,7 @@
 
         # init here
         plugin.DaemonPlugin.__init__(self)
+        self.plugin_name = 'MIXER'
 
         if 0:
             self.mainVolume   = 0

-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog

Reply via email to