Merge branch 'master' of fraxinas@git.opendreambox.org:/git/enigma2

4 files changed, 229 insertions, 74 deletions

diff --git a/lib/python/Plugins/Extensions/DVDPlayer/plugin.py b/lib/python/Plugins/Extensions/DVDPlayer/plugin.py
index b7d66a82..29e69ee1 100644
--- a/lib/python/Plugins/Extensions/DVDPlayer/plugin.py
+++ b/lib/python/Plugins/Extensions/DVDPlayer/plugin.py
@@ -1,5 +1,5 @@
 from os import path as os_path, remove as os_remove, listdir as os_listdir, system
-from enigma import eTimer, iPlayableService, iServiceInformation, eServiceReference, iServiceKeys
+from enigma import eTimer, iPlayableService, iServiceInformation, eServiceReference, iServiceKeys, getDesktop
 from Screens.Screen import Screen
 from Screens.MessageBox import MessageBox
 from Screens.ChoiceBox import ChoiceBox
@@ -109,10 +109,11 @@ class DVDSummary(Screen):
 		self["Title"].setText(title)
 
 class DVDOverlay(Screen):
-	skin = """<screen name="DVDOverlay" position="0,0" size="720,576" flags="wfNoBorder" zPosition="-1" backgroundColor="transparent" />"""
 	def __init__(self, session, args = None):
+		desktop_size = getDesktop(0).size()
+		DVDOverlay.skin = """<screen name="DVDOverlay" position="0,0" size="%d,%d" flags="wfNoBorder" zPosition="-1" backgroundColor="transparent" />""" %(desktop_size.width(), desktop_size.height())
 		Screen.__init__(self, session)
-		
+
 class ChapterZap(Screen):
 	skin = """
 	<screen name="ChapterZap" position="235,255" size="250,60" title="Chapter" >
@@ -352,7 +353,7 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP
 						if file.mimetype == "video/x-dvd":
 							self.dvd_device = devicepath
 							print "physical dvd found:", self.dvd_device
-							self.physicalDVD = True			
+							self.physicalDVD = True
 
 		self.dvd_filelist = dvd_filelist
 		self.onFirstExecBegin.append(self.showFileBrowser)
@@ -387,9 +388,6 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP
 
 	def serviceStarted(self): #override InfoBarShowHide function
 		self.dvdScreen.show()
-		subs = self.getServiceInterface("subtitle")
-		if subs:
-			subs.enableSubtitles(self.dvdScreen.instance, None)
 
 	def doEofInternal(self, playing):
 		if self.in_menu:
@@ -588,6 +586,9 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP
 				self.service = self.session.nav.getCurrentService()
 				print "self.service", self.service
 				print "cur_dlg", self.session.current_dialog
+				subs = self.getServiceInterface("subtitle")
+				if subs:
+					subs.enableSubtitles(self.dvdScreen.instance, None)
 
 	def exitCB(self, answer):
 		if answer is not None:
diff --git a/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp b/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp
index 1add04ab..d726be20 100644
--- a/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp
+++ b/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp
@@ -87,30 +87,48 @@ DEFINE_REF(eServiceDVD);
 eServiceDVD::eServiceDVD(const char *filename):
 	m_filename(filename),
 	m_ddvdconfig(ddvd_create()),
-	m_pixmap(new gPixmap(eSize(720, 576), 32)),
 	m_subtitle_widget(0),
 	m_state(stIdle),
 	m_current_trick(0),
 	m_pump(eApp, 1)
 {
+	int aspect = DDVD_16_9; 
+	int policy = DDVD_PAN_SCAN;
+
+	char tmp[255];
+	ssize_t rd;
+
 	m_sn = eSocketNotifier::create(eApp, ddvd_get_messagepipe_fd(m_ddvdconfig), eSocketNotifier::Read|eSocketNotifier::Priority|eSocketNotifier::Error|eSocketNotifier::Hungup);
-	std::string aspect;
 	eDebug("SERVICEDVD construct!");
 	// create handle
 	ddvd_set_dvd_path(m_ddvdconfig, filename);
 	ddvd_set_ac3thru(m_ddvdconfig, 0);
 	ddvd_set_language(m_ddvdconfig, "de");
 
-	if (ePythonConfigQuery::getConfigValue("config.av.aspect", aspect) != 0)
-		aspect = "16_9";
-	if (aspect == "4_3_letterbox")
-		ddvd_set_video(m_ddvdconfig, DDVD_4_3_LETTERBOX, DDVD_PAL);
-	else if (aspect == "4_3_panscan")
-		ddvd_set_video(m_ddvdconfig, DDVD_4_3_PAN_SCAN, DDVD_PAL);
-	else
-		ddvd_set_video(m_ddvdconfig, DDVD_16_9, DDVD_PAL);
+	int fd = open("/proc/stb/video/aspect", O_RDONLY);
+	if (fd > -1)
+	{
+		rd = read(fd, tmp, 255);
+		if (rd > 2 && !strncmp(tmp, "4:3", 3))
+			aspect = DDVD_4_3;
+		else if (rd > 4 && !strncmp(tmp, "16:10", 5))
+			aspect = DDVD_16_10;
+		close(fd);
+	}
+
+ 	fd = open("/proc/stb/video/policy", O_RDONLY);
+	if (fd > -1)
+	{
+		rd = read(fd, tmp, 255);
+		if (rd > 6 && !strncmp(tmp, "bestfit", 7))
+			policy = DDVD_JUSTSCALE;
+		else if (rd > 8 && !strncmp(tmp, "letterbox", 9))
+			policy = DDVD_LETTERBOX;
+		close(fd);
+	}
+
+	ddvd_set_video(m_ddvdconfig, aspect, policy, DDVD_PAL /*unused*/);
 
-	ddvd_set_lfb(m_ddvdconfig, (unsigned char *)m_pixmap->surface->data, 720, 576, 4, 720*4);
 	CONNECT(m_sn->activated, eServiceDVD::gotMessage);
 	CONNECT(m_pump.recv_msg, eServiceDVD::gotThreadMessage);
 	strcpy(m_ddvd_titlestring,"");
@@ -158,8 +176,11 @@ void eServiceDVD::gotMessage(int /*what*/)
 		}
 		case DDVD_SCREEN_UPDATE:
 			eDebug("DVD_SCREEN_UPDATE!");
-			if (m_subtitle_widget)
-				m_subtitle_widget->setPixmap(m_pixmap, eRect(0, 0, 720, 576));
+			if (m_subtitle_widget) {
+				int x1,x2,y1,y2;
+				ddvd_get_last_blit_area(m_ddvdconfig, &x1, &x2, &y1, &y2);
+				m_subtitle_widget->setPixmap(m_pixmap, eRect(x1, y1, x2-x1, y2-y1));
+			}
 			break;
 		case DDVD_SHOWOSD_STATE_PLAY:
 		{
@@ -259,6 +280,7 @@ eServiceDVD::~eServiceDVD()
 	kill();
 	saveCuesheet();
 	ddvd_close(m_ddvdconfig);
+	disableSubtitles(0);
 }
 
 RESULT eServiceDVD::connectEvent(const Slot2<void,iPlayableService*,int> &event, ePtr<eConnection> &connection)
@@ -272,7 +294,6 @@ RESULT eServiceDVD::start()
 	assert(m_state == stIdle);
 	m_state = stRunning;
 	eDebug("eServiceDVD starting");
-	run();
 // 	m_event(this, evStart);
 	return 0;
 }
@@ -514,13 +535,23 @@ PyObject *eServiceDVD::getInfoObject(int w)
 
 RESULT eServiceDVD::enableSubtitles(eWidget *parent, SWIG_PYOBJECT(ePyObject) /*entry*/)
 {
-	if (m_subtitle_widget)
-		delete m_subtitle_widget;
+	delete m_subtitle_widget;
+
 	m_subtitle_widget = new eSubtitleWidget(parent);
 	m_subtitle_widget->resize(parent->size());
-	m_subtitle_widget->setPixmap(m_pixmap, eRect(0, 0, 720, 576));
+
+	eSize size = parent->size();
+
+	if (!m_pixmap)
+	{
+		m_pixmap = new gPixmap(size, 32);
+		ddvd_set_lfb(m_ddvdconfig, (unsigned char *)m_pixmap->surface->data, size.width(), size.height(), 4, size.width()*4);
+		run(); // start the thread
+	}
+
 	m_subtitle_widget->setZPosition(-1);
 	m_subtitle_widget->show();
+
 	return 0;
 }
 
diff --git a/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py b/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py
index 928d72a6..d3714440 100644
--- a/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py
@@ -49,22 +49,54 @@ class PositionerSetup(Screen):
 		Screen.__init__(self, session)
 		self.feid = feid
 		self.oldref = None
-		
+
+		cur = { }
 		if not self.openFrontend():
 			self.oldref = session.nav.getCurrentlyPlayingServiceReference()
+			service = session.nav.getCurrentService()
+			feInfo = service and service.frontendInfo()
+			if feInfo:
+				cur = feInfo.getTransponderData(True)
+			del feInfo
+			del service
 			session.nav.stopService() # try to disable foreground service
 			if not self.openFrontend():
 				if session.pipshown: # try to disable pip
+					service = self.session.pip.pipservice
+					feInfo = service and service.frontendInfo()
+					if feInfo:
+						cur = feInfo.getTransponderData()
+					del feInfo
+					del service
 					session.pipshown = False
 					del session.pip
 					if not self.openFrontend():
 						self.frontend = None # in normal case this should not happen
-
+		
 		self.frontendStatus = { }
-
 		self.diseqc = Diseqc(self.frontend)
 		self.tuner = Tuner(self.frontend)
-		self.tuner.tune((0,0,0,0,0,0))
+
+		tp = ( cur.get("frequency", 0) / 1000,
+			cur.get("symbol_rate", 0) / 1000,
+			{ "HORIZONTAL" : 0, "VERTICAL" : 1,
+				"CIRCULAR_LEFT" : 2, "CIRCULAR_RIGHT" : 3 }[cur.get("polarization", "HORIZONTAL")],
+			{ "FEC_AUTO" : 0, "FEC_1_2" : 1, "FEC_2_3" : 2, "FEC_3_4" : 3,
+				"FEC_5_6" : 4, "FEC_7_8" : 5, "FEC_8_9" : 6, "FEC_3_5" : 7,
+				"FEC_4_5" : 8, "FEC_9_10" : 9, "FEC_NONE" : 15 }[cur.get("fec_inner", "FEC_AUTO")],
+			{ "INVERSION_OFF" : 0,
+				"INVERSION_ON" : 1,
+				"INVERSION_AUTO" : 2 }[cur.get("inversion", "INVERSION_AUTO")],
+			cur.get("orbital_position", 0),
+			{ "DVB-S" : 0, "DVB-S2" : 1 }[cur.get("system", "DVB-S")],
+			{ "QPSK" : 1, "8PSK" : 2 }[cur.get("modulation", "QPSK")],
+			{ "ROLLOFF_0_35" : 0, "ROLLOFF_0_25" : 1,
+				"ROLLOFF_0_20" : 2 }[cur.get("rolloff", "ROLLOFF_0_35")],
+			{ "PILOT_OFF" : 0, "PILOT_ON" : 1,
+				"PILOT_AUTO" : 2 }[cur.get("pilot", "PILOT_AUTO")]
+		)
+
+		self.tuner.tune(tp)
 		
 		self.createConfig()
 		
@@ -249,7 +281,12 @@ class PositionerSetup(Screen):
 		elif entry == "limits":
 			self.diseqccommand("limitOff")
 		elif entry == "tune":
-			self.session.openWithCallback(self.tune, TunerScreen, self.feid)
+			fe_data = { }
+			self.frontend.getFrontendData(fe_data)
+			self.frontend.getTransponderData(fe_data, True)
+			feparm = self.tuner.lastparm.getDVBS()
+			fe_data["orbital_position"] = feparm.orbital_position
+			self.session.openWithCallback(self.tune, TunerScreen, self.feid, fe_data)
 		elif entry == "goto0":
 			print "move to position 0"
 			self.diseqccommand("moveTo", 0)
@@ -272,6 +309,7 @@ class PositionerSetup(Screen):
 		elif entry == "storage":
 			print "store at position", int(self.positioner_storage.value)
 			self.diseqccommand("store", int(self.positioner_storage.value))
+			
 		elif entry == "limits":
 			self.diseqccommand("limitWest")
 
@@ -388,8 +426,10 @@ class Tuner:
 		parm.fec = transponder[3]
 		parm.inversion = transponder[4]
 		parm.orbital_position = transponder[5]
-		parm.system = 0  # FIXMEE !! HARDCODED DVB-S (add support for DVB-S2)
-		parm.modulation = 1 # FIXMEE !! HARDCODED QPSK
+		parm.system = transponder[6]
+		parm.modulation = transponder[7]
+		parm.rolloff = transponder[8]
+		parm.pilot = transponder[9]
 		feparm = eDVBFrontendParameters()
 		feparm.setDVBS(parm, True)
 		self.lastparm = feparm
@@ -415,8 +455,9 @@ class TunerScreen(ScanSetup):
 			<widget name="introduction" position="20,360" size="350,30" font="Regular;23" />
 		</screen>"""
 
-	def __init__(self, session, feid):
+	def __init__(self, session, feid, fe_data):
 		self.feid = feid
+		self.fe_data = fe_data
 		ScanSetup.__init__(self, session)
 		self["introduction"].setText("")
 
@@ -428,21 +469,35 @@ class TunerScreen(ScanSetup):
 		self.list.append(self.typeOfTuningEntry)
 		self.satEntry = getConfigListEntry(_('Satellite'), tuning.sat)
 		self.list.append(self.satEntry)
+		nim = nimmanager.nim_slots[self.feid]
+		self.systemEntry = None
+		
 		if tuning.type.value == "manual_transponder":
+			if nim.isCompatible("DVB-S2"):
+				self.systemEntry = getConfigListEntry(_('System'), self.scan_sat.system)
+				self.list.append(self.systemEntry)
+			else:
+				# downgrade to dvb-s, in case a -s2 config was active
+				self.scan_sat.system.value = "dvb-s"
 			self.list.append(getConfigListEntry(_('Frequency'), self.scan_sat.frequency))
 			self.list.append(getConfigListEntry(_('Inversion'), self.scan_sat.inversion))
 			self.list.append(getConfigListEntry(_('Symbol Rate'), self.scan_sat.symbolrate))
 			self.list.append(getConfigListEntry(_("Polarity"), self.scan_sat.polarization))
-			self.list.append(getConfigListEntry(_("FEC"), self.scan_sat.fec))
+			if self.scan_sat.system.value == "dvb-s":
+				self.list.append(getConfigListEntry(_("FEC"), self.scan_sat.fec))
+			elif self.scan_sat.system.value == "dvb-s2":
+				self.list.append(getConfigListEntry(_("FEC"), self.scan_sat.fec_s2))
+				self.modulationEntry = getConfigListEntry(_('Modulation'), self.scan_sat.modulation)
+				self.list.append(self.modulationEntry)
+				self.list.append(getConfigListEntry(_('Rolloff'), self.scan_sat.rolloff))
+				self.list.append(getConfigListEntry(_('Pilot'), self.scan_sat.pilot))
 		elif tuning.type.value == "predefined_transponder":
 			self.list.append(getConfigListEntry(_("Transponder"), tuning.transponder))
 		self["config"].list = self.list
 		self["config"].l.setList(self.list)
 
 	def newConfig(self):
-		if self["config"].getCurrent() == self.typeOfTuningEntry:
-			self.createSetup()
-		elif self["config"].getCurrent() == self.satEntry:
+		if self["config"].getCurrent() in (self.typeOfTuningEntry, self.satEntry, self.systemEntry):
 			self.createSetup()
 
 	def createConfig(self, foo):
@@ -456,8 +511,14 @@ class TunerScreen(ScanSetup):
 			tuning.sat = ConfigSatlist(list=nimmanager.getRotorSatListForNim(self.feid))
 			tuning.sat.addNotifier(self.tuningSatChanged)
 			self.updateTransponders()
-			TunerScreenConfigCreated = True
-		ScanSetup.createConfig(self, None)
+		orb_pos = self.fe_data.get("orbital_position", None)
+		if orb_pos is not None:
+			for x in nimmanager.getRotorSatListForNim(self.feid):
+				opos = str(orb_pos)
+				if x[0] == orb_pos and tuning.sat.value != opos:
+					tuning.sat.value = opos
+			del self.fe_data["orbital_position"]
+		ScanSetup.createConfig(self, self.fe_data)
 
 	def tuningSatChanged(self, *parm):
 		self.updateTransponders()
@@ -506,19 +567,38 @@ class TunerScreen(ScanSetup):
 			tuning.transponder = ConfigSelection(choices=tps)
 
 	def keyGo(self):
-		returnvalue = (0, 0, 0, 0, 0, 0)
+		returnvalue = (0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
 		satpos = int(tuning.sat.value)
 		if tuning.type.value == "manual_transponder":
+			if self.scan_sat.system.value == "dvb-s2":
+				fec = self.scan_sat.fec_s2.value
+			else:
+				fec = self.scan_sat.fec.value
 			returnvalue = (
 				self.scan_sat.frequency.value,
 				self.scan_sat.symbolrate.value,
 				self.scan_sat.polarization.index,
-				self.scan_sat.fec.index,
+				{ "auto": 0,
+				   "1_2": 1,
+				   "2_3": 2,
+				   "3_4": 3,
+				   "5_6": 4,
+				   "7_8": 5,
+				   "8_9": 6,
+				   "3_5": 7,
+				   "4_5": 8,
+				   "9_10": 9,
+				   "none": 15 }[fec],
 				self.scan_sat.inversion.index,
-				satpos)
+				satpos,
+				self.scan_sat.system.index,
+				self.scan_sat.modulation.index == 1 and 2 or 1,
+				self.scan_sat.rolloff.index,
+				self.scan_sat.pilot.index)
 		elif tuning.type.value == "predefined_transponder":
 			transponder = nimmanager.getTransponders(satpos)[tuning.transponder.index]
-			returnvalue = (int(transponder[1] / 1000), int(transponder[2] / 1000), transponder[3], transponder[4], 2, satpos)
+			returnvalue = (transponder[1] / 1000, transponder[2] / 1000,
+				transponder[3], transponder[4], 2, satpos, transponder[5], transponder[6], transponder[8], transponder[9])
 		self.close(returnvalue)
 
 	def keyCancel(self):
@@ -526,8 +606,8 @@ class TunerScreen(ScanSetup):
 
 class RotorNimSelection(Screen):
 	skin = """
-		<screen position="140,165" size="400,100" title="select Slot">
-			<widget name="nimlist" position="20,10" size="360,75" />
+		<screen position="140,165" size="400,130" title="select Slot">
+			<widget name="nimlist" position="20,10" size="360,100" />
 		</screen>"""
 
 	def __init__(self, session):
diff --git a/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py b/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py
index 064ac673..d61c1503 100644
--- a/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py
@@ -27,13 +27,15 @@ class Tuner:
 			parm.fec = transponder[3]
 			parm.inversion = transponder[4]
 			parm.orbital_position = transponder[5]
-			parm.system = 0  # FIXMEE !! HARDCODED DVB-S (add support for DVB-S2)
-			parm.modulation = 1 # FIXMEE !! HARDCODED QPSK 
+			parm.system = transponder[6]
+			parm.modulation = transponder[7]
+			parm.rolloff = transponder[8]
+			parm.pilot = transponder[9]
 			feparm = eDVBFrontendParameters()
-			feparm.setDVBS(parm)
+			feparm.setDVBS(parm, True)
 			self.lastparm = feparm
 			self.frontend.tune(feparm)
-	
+
 	def retune(self):
 		if self.frontend:
 			self.frontend.tune(self.lastparm)
@@ -85,25 +87,44 @@ class Satfinder(ScanSetup):
 		self.satEntry = None
 		
 		self.list = []
+
 		self.typeOfTuningEntry = getConfigListEntry(_('Tune'), self.tuning_type)
 		self.list.append(self.typeOfTuningEntry)
 		self.satEntry = getConfigListEntry(_('Satellite'), self.tuning_sat)
 		self.list.append(self.satEntry)
+
+		nim = nimmanager.nim_slots[self.feid]
+
+		self.systemEntry = None
 		if self.tuning_type.value == "manual_transponder":
+			if nim.isCompatible("DVB-S2"):
+				self.systemEntry = getConfigListEntry(_('System'), self.scan_sat.system)
+				self.list.append(self.systemEntry)
+			else:
+				# downgrade to dvb-s, in case a -s2 config was active
+				self.scan_sat.system.value = "dvb-s"
 			self.list.append(getConfigListEntry(_('Frequency'), self.scan_sat.frequency))
 			self.list.append(getConfigListEntry(_('Inversion'), self.scan_sat.inversion))
 			self.list.append(getConfigListEntry(_('Symbol Rate'), self.scan_sat.symbolrate))
 			self.list.append(getConfigListEntry(_("Polarity"), self.scan_sat.polarization))
-			self.list.append(getConfigListEntry(_("FEC"), self.scan_sat.fec))
+			if self.scan_sat.system.value == "dvb-s":
+				self.list.append(getConfigListEntry(_("FEC"), self.scan_sat.fec))
+			elif self.scan_sat.system.value == "dvb-s2":
+				self.list.append(getConfigListEntry(_("FEC"), self.scan_sat.fec_s2))
+				self.modulationEntry = getConfigListEntry(_('Modulation'), self.scan_sat.modulation)
+				self.list.append(self.modulationEntry)
+				self.list.append(getConfigListEntry(_('Rolloff'), self.scan_sat.rolloff))
+				self.list.append(getConfigListEntry(_('Pilot'), self.scan_sat.pilot))
 		elif self.tuning_transponder and self.tuning_type.value == "predefined_transponder":
 			self.list.append(getConfigListEntry(_("Transponder"), self.tuning_transponder))
 		self["config"].list = self.list
 		self["config"].l.setList(self.list)
 
 	def newConfig(self):
-		if self["config"].getCurrent() == self.typeOfTuningEntry:
+		cur = self["config"].getCurrent()
+		if cur in (self.typeOfTuningEntry, self.systemEntry):
 			self.createSetup()
-		elif self["config"].getCurrent() == self.satEntry:
+		elif cur == self.satEntry:
 			self.updateSats()
 			self.createSetup()
 
@@ -112,20 +133,43 @@ class Satfinder(ScanSetup):
 		self.retune(config_element)
 
 	def retune(self, configElement):
-		returnvalue = (0, 0, 0, 0, 0, 0, 0)
-		satpos = self.tuning_sat.orbital_position
-		
-		if satpos is not None:
-			if self.tuning_type.value == "manual_transponder":
-				returnvalue = (self.scan_sat.frequency.value, self.scan_sat.symbolrate.value, self.scan_sat.polarization.index, self.scan_sat.fec.index, self.scan_sat.inversion.index, satpos)
+		returnvalue = (0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
+		satpos = int(self.tuning_sat.value)
+		if self.tuning_type.value == "manual_transponder":
+			if self.scan_sat.system.value == "dvb-s2":
+				fec = self.scan_sat.fec_s2.value
+			else:
+				fec = self.scan_sat.fec.value
+			returnvalue = (
+				self.scan_sat.frequency.value,
+				self.scan_sat.symbolrate.value,
+				self.scan_sat.polarization.index,
+				{ "auto": 0,
+				   "1_2": 1,
+				   "2_3": 2,
+				   "3_4": 3,
+				   "5_6": 4,
+				   "7_8": 5,
+				   "8_9": 6,
+				   "3_5": 7,
+				   "4_5": 8,
+				   "9_10": 9,
+				   "none": 15 }[fec],
+				self.scan_sat.inversion.index,
+				satpos,
+				self.scan_sat.system.index,
+				self.scan_sat.modulation.index == 1 and 2 or 1,
+				self.scan_sat.rolloff.index,
+				self.scan_sat.pilot.index)
+			self.tune(returnvalue)
+		elif self.tuning_type.value == "predefined_transponder":
+			tps = nimmanager.getTransponders(satpos)
+			l = len(tps)
+			if l > self.tuning_transponder.index:
+				transponder = tps[self.tuning_transponder.index]
+				returnvalue = (transponder[1] / 1000, transponder[2] / 1000,
+					transponder[3], transponder[4], 2, satpos, transponder[5], transponder[6], transponder[8], transponder[9])
 				self.tune(returnvalue)
-			elif self.tuning_type.value == "predefined_transponder":
-				tps = nimmanager.getTransponders(satpos)
-				l = len(tps)
-				if l > self.tuning_transponder.index:
-					transponder = nimmanager.getTransponders(satpos)[self.tuning_transponder.index]
-					returnvalue = (int(transponder[1] / 1000), int(transponder[2] / 1000), transponder[3], transponder[4], 2, satpos)
-					self.tune(returnvalue)
 
 	def createConfig(self, foo):
 		self.tuning_transponder = None
@@ -134,14 +178,13 @@ class Satfinder(ScanSetup):
 		ScanSetup.createConfig(self, None)
 		
 		self.updateSats()
-		
-		self.tuning_type.addNotifier(self.retune, initial_call = False)
-		self.tuning_sat.addNotifier(self.sat_changed, initial_call = False)
-		self.scan_sat.frequency.addNotifier(self.retune, initial_call = False)
-		self.scan_sat.inversion.addNotifier(self.retune, initial_call = False)
-		self.scan_sat.symbolrate.addNotifier(self.retune, initial_call = False)
-		self.scan_sat.polarization.addNotifier(self.retune, initial_call = False)
-		self.scan_sat.fec.addNotifier(self.retune, initial_call = False)
+
+		for x in (self.tuning_type, self.tuning_sat, self.scan_sat.frequency,
+			self.scan_sat.inversion, self.scan_sat.symbolrate,
+			self.scan_sat.polarization, self.scan_sat.fec, self.scan_sat.pilot,
+			self.scan_sat.fec_s2, self.scan_sat.fec, self.scan_sat.modulation,
+			self.scan_sat.rolloff, self.scan_sat.system):
+			x.addNotifier(self.retune, initial_call = False)
 
 	def updateSats(self):
 		orb_pos = self.tuning_sat.orbital_position
@@ -216,8 +259,8 @@ class Satfinder(ScanSetup):
 
 class SatNimSelection(Screen):
 	skin = """
-		<screen position="140,165" size="400,100" title="select Slot">
-			<widget name="nimlist" position="20,10" size="360,75" />
+		<screen position="140,165" size="400,130" title="select Slot">
+			<widget name="nimlist" position="20,10" size="360,100" />
 		</screen>"""
 		
 	def __init__(self, session):