X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fpython%2FComponents%2FRFmod.py;h=ff87a729dbd58d39f105df944fd5e117df20f23e;hb=8639b38f47e5dbe5c14ef53b28a913bdb0f9b53d;hp=fc5579fcad9101f788e304b4799cc363d024f78e;hpb=e4ef86473060528115c4469d3e912f398a68a397;p=vuplus_dvbapp

diff --git a/lib/python/Components/RFmod.py b/lib/python/Components/RFmod.py
index fc5579f..ff87a72 100644
--- a/lib/python/Components/RFmod.py
+++ b/lib/python/Components/RFmod.py
@@ -1,6 +1,10 @@
 from config import *
 from enigma import *
 
+# CHECK ME.
+RFMOD_CHANNEL_MIN = 21
+RFMOD_CHANNEL_MAX = 69 + 1
+
 class RFmod:
 	def __init__(self):
 		pass
@@ -21,12 +25,12 @@ class RFmod:
 def InitRFmod():
 
 	config.rfmod = ConfigSubsection();
-	config.rfmod.enable = configElement("config.rfmod.enable", configBoolean, 1, ("Enable", "Disable") );
-	config.rfmod.test = configElement("config.rfmod.test", configBoolean, 1, ("Enable", "Disable") );
-	config.rfmod.sound = configElement("config.rfmod.sound", configBoolean, 0, ("Enable", "Disable") );
-	config.rfmod.soundcarrier = configElement("config.rfmod.soundcarrier", configBoolean, 1, ("4.5 MHz", "5.5 MHz", "6.0 MHz", "6.5 MHz") );
-	config.rfmod.channel = configElement("config.rfmod.channel", configBoolean, 6, ("30", "31", "32", "33", "34", "35", "36", "37", "38", "39") );
-	config.rfmod.finetune = configElement("config.rfmod.finetune", ConfigSlider, 5, "");
+	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()
 
@@ -37,11 +41,11 @@ def InitRFmod():
 	def setSoundFunction(configElement):
 		iRFmod.setSoundFunction(configElement.value);
 	def setSoundCarrier(configElement):
-		iRFmod.setSoundCarrier(configElement.value);
+		iRFmod.setSoundCarrier(int(configElement.value));
 	def setChannel(configElement):
-		iRFmod.setChannel(configElement.value);
+		iRFmod.setChannel(int(configElement.value));
 	def setFinetune(configElement):
-		iRFmod.setFinetune(configElement.value);
+		iRFmod.setFinetune(configElement.value - 5);
 
 	# this will call the "setup-val" initial
 	config.rfmod.enable.addNotifier(setFunction);