fix rfmod audio (on and off was swapped)

[enigma2.git] / lib / python / Components / RFmod.py

diff --git a/lib/python/Components/RFmod.py b/lib/python/Components/RFmod.py
index 65adf7c9bc205a772822b68cad672b43c39853c9..be088a53d3f1defa54847ed443f7b60c5680258d 100644 (file)
--- a/lib/python/Components/RFmod.py
+++ b/lib/python/Components/RFmod.py
@@ -1,5 +1,5 @@
-from config import *
-from enigma import *
+from config import config, ConfigSelection, ConfigSubsection, ConfigOnOff, ConfigSlider
+from enigma import eRFmod

 
 # CHECK ME.
 RFMOD_CHANNEL_MIN = 21
 
 # CHECK ME.
 RFMOD_CHANNEL_MIN = 21


@@ -10,11 +10,11 @@ class RFmod:
                pass
 
        def setFunction(self, value):
                pass
 
        def setFunction(self, value):

-               eRFmod.getInstance().setFunction(value)
+               eRFmod.getInstance().setFunction(not value)

        def setTestmode(self, value):
                eRFmod.getInstance().setTestmode(value)
        def setSoundFunction(self, value):
        def setTestmode(self, value):
                eRFmod.getInstance().setTestmode(value)
        def setSoundFunction(self, value):

-               eRFmod.getInstance().setSoundFunction(value)
+               eRFmod.getInstance().setSoundFunction(not value)

        def setSoundCarrier(self, value):
                eRFmod.getInstance().setSoundCarrier(value)
        def setChannel(self, value):
        def setSoundCarrier(self, value):
                eRFmod.getInstance().setSoundCarrier(value)
        def setChannel(self, value):


@@ -24,13 +24,13 @@ class RFmod:
 
 def InitRFmod():
 
 
 def InitRFmod():
 

-       config.rfmod = ConfigSubsection();
-       config.rfmod.enable = configElement("config.rfmod.enable", configSelection, 1, (("enable", _("Enable")), ("disable", _("Disable"))) );
-       config.rfmod.test = configElement("config.rfmod.test", configSelection, 0, (("disable", _("Disable")), ("enable", _("Enable"))) );
-       config.rfmod.sound = configElement("config.rfmod.sound", configSelection, 0, (("enable", _("Enable")), ("disable", _("Disable"))) );
-       config.rfmod.soundcarrier = configElement("config.rfmod.soundcarrier", configSelection, 1, ("4.5 MHz", "5.5 MHz", "6.0 MHz", "6.5 MHz") );
-       config.rfmod.channel = configElement("config.rfmod.channel", configSelection, 36 - RFMOD_CHANNEL_MIN, tuple(["%d" % x for x in range(RFMOD_CHANNEL_MIN, RFMOD_CHANNEL_MAX)]))
-       config.rfmod.finetune = configElement("config.rfmod.finetune", configSlider, 5, (1, 10));
+       config.rfmod = ConfigSubsection()
+       config.rfmod.enable = ConfigOnOff(default=False)
+       config.rfmod.test = ConfigOnOff(default=False)
+       config.rfmod.sound = ConfigOnOff(default=True)
+       config.rfmod.soundcarrier = ConfigSelection(choices=[("4500","4.5 MHz"), ("5500", "5.5 MHz"), ("6000", "6.0 MHz"), ("6500", "6.5 MHz")], default="5500")
+       config.rfmod.channel = ConfigSelection(default = "36", choices = ["%d" % x for x in range(RFMOD_CHANNEL_MIN, RFMOD_CHANNEL_MAX)])
+       config.rfmod.finetune = ConfigSlider(default=5, limits=(1, 10))

 
        iRFmod = RFmod()
 
 
        iRFmod = RFmod()
 


@@ -41,9 +41,9 @@ def InitRFmod():
        def setSoundFunction(configElement):
                iRFmod.setSoundFunction(configElement.value);
        def setSoundCarrier(configElement):
        def setSoundFunction(configElement):
                iRFmod.setSoundFunction(configElement.value);
        def setSoundCarrier(configElement):

-               iRFmod.setSoundCarrier(configElement.value);
+               iRFmod.setSoundCarrier(configElement.index);

        def setChannel(configElement):
        def setChannel(configElement):

-               iRFmod.setChannel(configElement.value +  30);
+               iRFmod.setChannel(int(configElement.value));

        def setFinetune(configElement):
                iRFmod.setFinetune(configElement.value - 5);
 
        def setFinetune(configElement):
                iRFmod.setFinetune(configElement.value - 5);