Merge branch 'master' into obi/master

Conflicts:
	main/Makefile.am

18 files changed, 173 insertions, 80 deletions

diff --git a/lib/dvb/pmt.cpp b/lib/dvb/pmt.cpp
index 46fa12ed..ca56141b 100644
--- a/lib/dvb/pmt.cpp
+++ b/lib/dvb/pmt.cpp
@@ -149,7 +149,7 @@ void eDVBServicePMTHandler::PATready(int)
 		serviceEvent(eventNoPAT);
 }
 
-PyObject *eDVBServicePMTHandler::getCaIds()
+PyObject *eDVBServicePMTHandler::getCaIds(bool pair)
 {
 	ePyObject ret;
 
@@ -157,20 +157,37 @@ PyObject *eDVBServicePMTHandler::getCaIds()
 
 	if ( !getProgramInfo(prog) )
 	{
-		int cnt=prog.caids.size();
-		if (cnt)
+		if (pair)
 		{
+			int cnt=prog.caids.size();
+			if (cnt)
+			{
+				ret=PyList_New(cnt);
+				std::list<program::capid_pair>::iterator it(prog.caids.begin());
+				while(cnt--)
+				{
+					ePyObject tuple = PyTuple_New(2);
+					PyTuple_SET_ITEM(tuple, 0, PyInt_FromLong(it->caid));
+					PyTuple_SET_ITEM(tuple, 1, PyInt_FromLong((it++)->capid));
+					PyList_SET_ITEM(ret, cnt, tuple);
+				}
+			}
+		}
+		else
+		{
+			std::set<program::capid_pair> set(prog.caids.begin(), prog.caids.end());
+			std::set<program::capid_pair>::iterator it(set.begin());
+			int cnt=set.size();
 			ret=PyList_New(cnt);
-			std::set<uint16_t>::iterator it(prog.caids.begin());
 			while(cnt--)
-				PyList_SET_ITEM(ret, cnt, PyInt_FromLong(*it++));
+				PyList_SET_ITEM(ret, cnt, PyInt_FromLong((it++)->caid));
 		}
 	}
 
 	return ret ? (PyObject*)ret : (PyObject*)PyList_New(0);
 }
 
-int eDVBServicePMTHandler::getProgramInfo(struct program &program)
+int eDVBServicePMTHandler::getProgramInfo(program &program)
 {
 	ePtr<eTable<ProgramMapSection> > ptr;
 	int cached_apid_ac3 = -1;
@@ -460,7 +477,10 @@ int eDVBServicePMTHandler::getProgramInfo(struct program &program)
 							case CA_DESCRIPTOR:
 							{
 								CaDescriptor *descr = (CaDescriptor*)(*desc);
-								program.caids.insert(descr->getCaSystemId());
+								program::capid_pair pair;
+								pair.caid = descr->getCaSystemId();
+								pair.capid = descr->getCaPid();
+								program.caids.push_back(pair);
 								break;
 							}
 							default:
@@ -523,7 +543,10 @@ int eDVBServicePMTHandler::getProgramInfo(struct program &program)
 					if ((*desc)->getTag() == CA_DESCRIPTOR)
 					{
 						CaDescriptor *descr = (CaDescriptor*)(*desc);
-						program.caids.insert(descr->getCaSystemId());
+						program::capid_pair pair;
+						pair.caid = descr->getCaSystemId();
+						pair.capid = descr->getCaPid();
+						program.caids.push_back(pair);
 					}
 				}
 			}
@@ -589,8 +612,12 @@ int eDVBServicePMTHandler::getProgramInfo(struct program &program)
 			program.textPid = cached_tpid;
 		}
 		CAID_LIST &caids = m_service->m_ca;
-		for (CAID_LIST::iterator it(caids.begin()); it != caids.end(); ++it)
-			program.caids.insert(*it);
+		for (CAID_LIST::iterator it(caids.begin()); it != caids.end(); ++it) {
+			program::capid_pair pair;
+			pair.caid = *it;
+			pair.capid = -1; // not known yet
+			program.caids.push_back(pair);
+		}
 		if ( cnt )
 			ret = 0;
 	}
diff --git a/lib/dvb/pmt.h b/lib/dvb/pmt.h
index de0de052..5c8fa582 100644
--- a/lib/dvb/pmt.h
+++ b/lib/dvb/pmt.h
@@ -181,11 +181,17 @@ public:
 
 	struct program
 	{
+		struct capid_pair
+		{
+			uint16_t caid;
+			int capid;
+			bool operator< (const struct capid_pair &t) { return t.caid < caid; }
+		};
 		std::vector<videoStream> videoStreams;
 		std::vector<audioStream> audioStreams;
 		int defaultAudioStream;
 		std::vector<subtitleStream> subtitleStreams;
-		std::set<uint16_t> caids;
+		std::list<capid_pair> caids;
 		int pcrPid;
 		int pmtPid;
 		int textPid;
@@ -193,10 +199,10 @@ public:
 		PyObject *createPythonObject();
 	};
 
-	int getProgramInfo(struct program &program);
+	int getProgramInfo(program &program);
 	int getDataDemux(ePtr<iDVBDemux> &demux);
 	int getDecodeDemux(ePtr<iDVBDemux> &demux);
-	PyObject *getCaIds();
+	PyObject *getCaIds(bool pair=false); // caid / ecmpid pair
 	
 	int getPVRChannel(ePtr<iDVBPVRChannel> &pvr_channel);
 	int getServiceReference(eServiceReferenceDVB &service) { service = m_reference; return 0; }
diff --git a/lib/dvb/sec.cpp b/lib/dvb/sec.cpp
index d48d44e1..a2bc8869 100644
--- a/lib/dvb/sec.cpp
+++ b/lib/dvb/sec.cpp
@@ -212,7 +212,7 @@ int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite
 
 				eSecDebugNoSimulate("ret5 %d", ret);
 
-				if (ret && lnb_param.SatCR_idx == -1)
+				if (ret && !is_unicable)
 				{
 					int lof = sat.frequency > lnb_param.m_lof_threshold ?
 						lnb_param.m_lof_hi : lnb_param.m_lof_lo;
@@ -300,11 +300,6 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 		if ( sit != lnb_param.m_satellites.end())
 		{
 			eSecCommandList sec_sequence;
-
-			lnb_param.guard_offset = 0; //HACK
-
-			frontend.setData(eDVBFrontend::SATCR, lnb_param.SatCR_idx);
-			
 			eDVBSatelliteSwitchParameters &sw_param = sit->second;
 			bool doSetFrontend = true;
 			bool doSetVoltageToneFrontend = true;
@@ -327,6 +322,11 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 			eDVBSatelliteDiseqcParameters::t_diseqc_mode diseqc_mode = di_param.m_diseqc_mode;
 			eDVBSatelliteSwitchParameters::t_voltage_mode voltage_mode = sw_param.m_voltage_mode;
 			bool diseqc13V = voltage_mode == eDVBSatelliteSwitchParameters::HV_13;
+			bool is_unicable = lnb_param.SatCR_idx != -1;
+
+			lnb_param.guard_offset = 0; //HACK
+
+			frontend.setData(eDVBFrontend::SATCR, lnb_param.SatCR_idx);
 
 			if (diseqc13V)
 				voltage_mode = eDVBSatelliteSwitchParameters::HV;
@@ -371,13 +371,10 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 
 			int lof = (band&1)?lnb_param.m_lof_hi:lnb_param.m_lof_lo;
 
-			int local=0;
-
-
-			if(lnb_param.SatCR_idx == -1)
+			if(!is_unicable)
 			{
-			// calc Frequency
-				local = abs(sat.frequency 
+				// calc Frequency
+				int local= abs(sat.frequency 
 					- lof);
 				parm.FREQUENCY = ((((local * 2) / 125) + 1) / 2) * 125;
 				frontend.setData(eDVBFrontend::FREQ_OFFSET, sat.frequency - parm.FREQUENCY);
@@ -551,6 +548,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 
 					if ( send_mask )
 					{
+						int diseqc_repeats = diseqc_mode > eDVBSatelliteDiseqcParameters::V1_0 ? di_param.m_repeats : 0;
 						int vlt = iDVBFrontend::voltageOff;
 						eSecCommand::pair compare;
 						compare.steps = +3;
@@ -623,7 +621,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 							if ( send_mask & 2 )
 								++loops;
 
-							loops <<= di_param.m_repeats;
+							loops <<= diseqc_repeats;
 
 							for ( int i = 0; i < loops;)  // fill commands...
 							{
@@ -660,7 +658,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 									int tmp = m_params[DELAY_BETWEEN_DISEQC_REPEATS];
 									if (cmd)
 									{
-										int delay = di_param.m_repeats ? (tmp - 54) / 2 : tmp;  // standard says 100msek between two repeated commands
+										int delay = diseqc_repeats ? (tmp - 54) / 2 : tmp;  // standard says 100msek between two repeated commands
 										sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, delay) );
 										diseqc.data[2]=cmd;
 										diseqc.data[3]=(cmd==0x38) ? csw : ucsw;
@@ -693,7 +691,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 					if ( RotorCmd != -1 && RotorCmd != lastRotorCmd )
 					{
 						eSecCommand::pair compare;
-						if (!send_mask && lnb_param.SatCR_idx == -1)
+						if (!send_mask && !is_unicable)
 						{
 							compare.steps = +3;
 							compare.tone = iDVBFrontend::toneOff;
@@ -747,10 +745,10 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 							diseqc.data[3] = RotorCmd;
 							diseqc.data[4] = 0x00;
 						}
-//						if(lnb_param.SatCR_idx == -1)
+//						if(!is_unicable)
 						{
 							int mrt = m_params[MOTOR_RUNNING_TIMEOUT]; // in seconds!
-							if ( rotor_param.m_inputpower_parameters.m_use || lnb_param.SatCR_idx == -1)
+							if ( rotor_param.m_inputpower_parameters.m_use && !is_unicable)
 							{ // use measure rotor input power to detect rotor state
 								bool turn_fast = need_turn_fast(rotor_param.m_inputpower_parameters.m_turning_speed);
 								eSecCommand::rotor cmd;
@@ -882,7 +880,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 			sec_fe->setData(eDVBFrontend::NEW_UCSW, ucsw);
 			sec_fe->setData(eDVBFrontend::NEW_TONEBURST, di_param.m_toneburst_param);
 
-			if ((doSetVoltageToneFrontend) && (lnb_param.SatCR_idx == -1))
+			if (doSetVoltageToneFrontend && !is_unicable)
 			{
 				eSecCommand::pair compare;
 				compare.voltage = voltage;
@@ -898,7 +896,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 
 			sec_sequence.push_back( eSecCommand(eSecCommand::UPDATE_CURRENT_SWITCHPARMS) );
 
-			if(lnb_param.SatCR_idx != -1)
+			if(is_unicable)
 			{
 				// check if voltage is disabled
 				eSecCommand::pair compare;
diff --git a/lib/dvb/tstools.cpp b/lib/dvb/tstools.cpp
index cfea3fdd..1403059f 100644
--- a/lib/dvb/tstools.cpp
+++ b/lib/dvb/tstools.cpp
@@ -40,7 +40,7 @@ int eDVBTSTools::openFile(const char *filename, int nostreaminfo)
 	if (f->open(filename, 1) < 0)
 		return -1;
 
-	setSource(src, filename);
+	setSource(src, nostreaminfo ? NULL : filename);
 
 	return 0;
 }
diff --git a/lib/dvb_ci/dvbci.cpp b/lib/dvb_ci/dvbci.cpp
index 883fb5a4..8a43e5b1 100644
--- a/lib/dvb_ci/dvbci.cpp
+++ b/lib/dvb_ci/dvbci.cpp
@@ -297,8 +297,9 @@ void eDVBCIInterfaces::recheckPMTHandlers()
 		if (!pmthandler->getProgramInfo(p))
 		{
 			int cnt=0;
-			for (caidSet::reverse_iterator x(p.caids.rbegin()); x != p.caids.rend(); ++x, ++cnt)
-				caids.push_front(*x);
+			std::set<eDVBServicePMTHandler::program::capid_pair> set(p.caids.begin(), p.caids.end());
+			for (std::set<eDVBServicePMTHandler::program::capid_pair>::reverse_iterator x(set.rbegin()); x != set.rend(); ++x, ++cnt)
+				caids.push_front(x->caid);
 			if (service && cnt)
 				service->m_ca = caids;
 		}
diff --git a/lib/gui/elistboxcontent.cpp b/lib/gui/elistboxcontent.cpp
index 97e2cc67..a19e11a3 100644
--- a/lib/gui/elistboxcontent.cpp
+++ b/lib/gui/elistboxcontent.cpp
@@ -501,6 +501,7 @@ eListboxPythonMultiContent::~eListboxPythonMultiContent()
 {
 	Py_XDECREF(m_buildFunc);
 	Py_XDECREF(m_selectableFunc);
+	Py_XDECREF(m_template);
 }
 
 void eListboxPythonMultiContent::setSelectionClip(eRect &rect, bool update)
@@ -1158,5 +1159,7 @@ void eListboxPythonMultiContent::entryRemoved(int idx)
 
 void eListboxPythonMultiContent::setTemplate(ePyObject tmplate)
 {
+	Py_XDECREF(m_template);
 	m_template = tmplate;
+	Py_XINCREF(m_template);
 }
diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
index d8a7c5c2..7f7dd5c4 100644
--- a/lib/python/Components/NimManager.py
+++ b/lib/python/Components/NimManager.py
@@ -390,6 +390,7 @@ class SecConfigure:
 
 					if currLnb.diseqcMode.value == "1_0":
 						currCO = currLnb.commandOrder1_0.value
+						sec.setRepeats(0)
 					else:
 						currCO = currLnb.commandOrder.value
 
diff --git a/lib/python/Plugins/Extensions/DVDBurn/DVDProject.py b/lib/python/Plugins/Extensions/DVDBurn/DVDProject.py
index 7f755db4..6dbcd499 100644
--- a/lib/python/Plugins/Extensions/DVDBurn/DVDProject.py
+++ b/lib/python/Plugins/Extensions/DVDBurn/DVDProject.py
@@ -2,6 +2,7 @@ from Tools.Directories import fileExists
 from Components.config import config, ConfigSubsection, ConfigInteger, ConfigText, ConfigSelection, getConfigListEntry, ConfigSequence, ConfigSubList
 import DVDTitle
 import xml.dom.minidom
+from Tools.Directories import resolveFilename, SCOPE_PLUGINS, SCOPE_FONTS
 
 class ConfigColor(ConfigSequence):
 	def __init__(self, default = [128,128,128]):
@@ -125,6 +126,14 @@ class DVDProject:
 			for key in self.filekeys:
 				val = self.settings.dict()[key].getValue()
 				if not fileExists(val):
+					if val[0] != "/":
+						if key.find("font") == 0:
+							val = resolveFilename(SCOPE_FONTS)+val
+						else:
+							val = resolveFilename(SCOPE_PLUGINS)+"Extensions/DVDBurn/"+val
+						if fileExists(val):
+							self.settings.dict()[key].setValue(val)
+							continue
 					self.error += "\n%s '%s' not found" % (key, val)
 		#except AttributeError:
 		  	#print "loadProject AttributeError", self.error
diff --git a/lib/python/Plugins/Extensions/DVDBurn/DreamboxDVD.ddvdp.xml b/lib/python/Plugins/Extensions/DVDBurn/DreamboxDVD.ddvdp.xml
index 451e8a8b..4645260d 100644
--- a/lib/python/Plugins/Extensions/DVDBurn/DreamboxDVD.ddvdp.xml
+++ b/lib/python/Plugins/Extensions/DVDBurn/DreamboxDVD.ddvdp.xml
@@ -3,11 +3,11 @@
 	<settings
 		name="Dreambox DVD record"
 		authormode="menu_linked"
-		menutemplate="/usr/lib/enigma2/python/Plugins/Extensions/DVDBurn/Thumbs_menu_clouds.ddvdm.xml"
+		menutemplate="Thumbs_menu_clouds.ddvdm.xml"
 		titlesetmode="multi"
-		vmgm="/usr/lib/enigma2/python/Plugins/Extensions/DVDBurn/vmgmdream.mpg"
+		vmgm="vmgmdream.mpg"
 		output="dvd"
-		isopath="/media/hdd/movie/"
+		isopath="/hdd/movie/"
 		dataformat="iso9660_4"
 	/>
 	<titles> </titles>
diff --git a/lib/python/Plugins/Extensions/DVDBurn/Text_menu_boat.ddvdm.xml b/lib/python/Plugins/Extensions/DVDBurn/Text_menu_boat.ddvdm.xml
index 0de7f4b6..bf6356a9 100644
--- a/lib/python/Plugins/Extensions/DVDBurn/Text_menu_boat.ddvdm.xml
+++ b/lib/python/Plugins/Extensions/DVDBurn/Text_menu_boat.ddvdm.xml
@@ -3,17 +3,17 @@
 	<settings
 		titleformat="$i. $t"
 		subtitleformat="$D.$M.$Y, $T $C, $d"
-		menubg="/usr/lib/enigma2/python/Plugins/Extensions/DVDBurn/dreamdvd_boat.jpg"
-		menuaudio="/usr/lib/enigma2/python/Plugins/Extensions/DVDBurn/silence.mp2"
+		menubg="dreamdvd_boat.jpg"
+		menuaudio="silence.mp2"
 		dimensions="(720, 576)"
 		rows="5"
 		cols="1"
 		color_button="[8, 0, 0]"
 		color_highlight="[0, 192, 192]"
 		color_headline="[0, 0, 128]"
-		fontface_headline="/usr/share/fonts/nmsbd.ttf"
-		fontface_title="/usr/share/fonts/nmsbd.ttf"
-		fontface_subtitle="/usr/share/fonts/nmsbd.ttf"
+		fontface_headline="nmsbd.ttf"
+		fontface_title="nmsbd.ttf"
+		fontface_subtitle="nmsbd.ttf"
 		fontsize_headline="46"
 		fontsize_title="24"
 		fontsize_subtitle="14"
diff --git a/lib/python/Plugins/Extensions/DVDBurn/Thumbs_menu_clouds.ddvdm.xml b/lib/python/Plugins/Extensions/DVDBurn/Thumbs_menu_clouds.ddvdm.xml
index c00c3fee..074f2037 100644
--- a/lib/python/Plugins/Extensions/DVDBurn/Thumbs_menu_clouds.ddvdm.xml
+++ b/lib/python/Plugins/Extensions/DVDBurn/Thumbs_menu_clouds.ddvdm.xml
@@ -3,17 +3,17 @@
 	<settings
 		titleformat="$t"
 		subtitleformat="$d"
-		menubg="/usr/lib/enigma2/python/Plugins/Extensions/DVDBurn/dreamdvd_clouds.jpg"
-		menuaudio="/usr/lib/enigma2/python/Plugins/Extensions/DVDBurn/silence.mp2"
+		menubg="dreamdvd_clouds.jpg"
+		menuaudio="silence.mp2"
 		dimensions="(720, 576)"
 		rows="2"
 		cols="2"
 		color_button="[8, 0, 0]"
 		color_highlight="[128, 0, 0]"
 		color_headline="[128, 0, 0]"
-		fontface_headline="/usr/share/fonts/nmsbd.ttf"
-		fontface_title="/usr/share/fonts/nmsbd.ttf"
-		fontface_subtitle="/usr/share/fonts/nmsbd.ttf"
+		fontface_headline="nmsbd.ttf"
+		fontface_title="nmsbd.ttf"
+		fontface_subtitle="nmsbd.ttf"
 		fontsize_headline="46"
 		fontsize_title="18"
 		fontsize_subtitle="12"
diff --git a/lib/python/Plugins/Extensions/DVDPlayer/plugin.py b/lib/python/Plugins/Extensions/DVDPlayer/plugin.py
index 64b4ae50..e1ab3ef4 100755
--- a/lib/python/Plugins/Extensions/DVDPlayer/plugin.py
+++ b/lib/python/Plugins/Extensions/DVDPlayer/plugin.py
@@ -39,8 +39,11 @@ class FileBrowser(Screen):
 				currDir = "/media/dvd/"
 			if not pathExists(currDir):
 				currDir = "/"
+			if lastpath == "":  # 'None' is magic to start at the list of mountpoints
+				currDir = None
 
-			self.filelist = FileList(currDir, matchingPattern = "(?i)^.*\.(iso)", useServiceRef = True)
+			inhibitDirs = ["/bin", "/boot", "/dev", "/etc", "/home", "/lib", "/proc", "/sbin", "/share", "/sys", "/tmp", "/usr", "/var"]
+			self.filelist = FileList(currDir, matchingPattern = "(?i)^.*\.(iso|img)", useServiceRef = True)
 			self["filelist"] = self.filelist
 
 		self["FilelistActions"] = ActionMap(["SetupActions"],
@@ -79,6 +82,12 @@ class FileBrowser(Screen):
 					lastpath = (pathname.rstrip("/").rsplit("/",1))[0]
 					print "lastpath video_ts.ifo=", lastpath
 					self.close(pathname)
+				if fileExists(pathname+"VIDEO_TS/VIDEO_TS.IFO"):
+					print "dvd structure found, trying to open..."
+					lastpath = (pathname.rstrip("/").rsplit("/",1))[0]
+					print "lastpath video_ts.ifo=", lastpath
+					pathname += "VIDEO_TS"
+					self.close(pathname)
 			else:
 				lastpath = filename[0:filename.rfind("/")]
 				print "lastpath directory=", lastpath
@@ -625,6 +634,14 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP
 			newref = eServiceReference(4369, 0, val)
 			print "play", newref.toString()
 			if curref is None or curref != newref:
+				if newref.toString().endswith("/VIDEO_TS") or newref.toString().endswith("/"):
+					names = newref.toString().rsplit("/",3)
+					if names[2].startswith("Disk ") or names[2].startswith("DVD "):
+						name = str(names[1]) + " - " + str(names[2])
+					else:
+						name = names[2]
+					print "setting name to: ", self.service
+					newref.setName(str(name))
 				self.session.nav.playService(newref)
 				self.service = self.session.nav.getCurrentService()
 				print "self.service", self.service
diff --git a/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp b/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp
index 2ba53927..5fbfb0aa 100644
--- a/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp
+++ b/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp
@@ -32,6 +32,7 @@ eServiceFactoryDVD::eServiceFactoryDVD()
 	{
 		std::list<std::string> extensions;
 		extensions.push_back("iso");
+		extensions.push_back("img");
 		sc->addServiceFactory(eServiceFactoryDVD::id, this, extensions);
 	}
 }
@@ -480,7 +481,10 @@ RESULT eServiceDVD::getName(std::string &name)
 	if ( m_ddvd_titlestring[0] != '\0' )
 		name = m_ddvd_titlestring;
 	else
-		name = m_ref.path;
+		if ( !m_ref.name.empty() )
+			name = m_ref.name;
+		else
+			name = m_ref.path;
 	return 0;
 }
 
diff --git a/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py b/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py
index 296d3bca..85ecc92d 100644
--- a/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py
+++ b/lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py
@@ -16,7 +16,7 @@ from Components.MultiContent import MultiContentEntryText
 from Components.ScrollLabel import ScrollLabel
 from Components.Harddisk import harddiskmanager
 from Components.Task import Task, Job, job_manager, Condition
-from Tools.Directories import fileExists, isMount
+from Tools.Directories import fileExists, isMount, resolveFilename, SCOPE_HDD, SCOPE_MEDIA
 from Tools.HardwareInfo import HardwareInfo
 from Tools.Downloader import downloadWithProgress
 from enigma import eConsoleAppContainer, gFont, RT_HALIGN_LEFT, RT_HALIGN_CENTER, RT_VALIGN_CENTER, RT_WRAP, eTimer
@@ -391,7 +391,7 @@ class NFIDownload(Screen):
 		
 		self.box = HardwareInfo().get_device_name()
 		self.feed_base = "http://www.dreamboxupdate.com/opendreambox" #/1.5/%s/images/" % self.box	
-		self.usbmountpoint = "/mnt/usb/"
+		self.usbmountpoint = resolveFilename(SCOPE_MEDIA)+"usb/"
 
 		self.menulist = []
 
@@ -570,7 +570,7 @@ class NFIDownload(Screen):
 
 	def ackedDestination(self):
 		print "[ackedDestination]", self.branch, self.target_dir
-		self.container.setCWD("/mnt")
+		self.container.setCWD(resolveFilename(SCOPE_MEDIA)+"usb/")
 		if self.target_dir[:8] == "/autofs/":
 			self.target_dir = "/dev/" + self.target_dir[8:-1]
 
@@ -792,13 +792,14 @@ If you already have a prepared bootable USB stick, please insert it now. Otherwi
 		self.umountCallback()
 
 def main(session, **kwargs):
-	session.open(NFIDownload,"/home/root")
+	session.open(NFIDownload,resolveFilename(SCOPE_HDD))
 
 def filescan_open(list, session, **kwargs):
 	dev = "/dev/" + (list[0].path).rsplit('/',1)[0][7:]
-	print "mounting device " + dev + " to /mnt/usb..."
-	system("mount "+dev+" /mnt/usb/ -o rw,sync")
-	session.open(NFIDownload,"/mnt/usb/")
+	print "mounting device " + dev + " to /media/usb..."
+	usbmountpoint = resolveFilename(SCOPE_MEDIA)+"usb/"
+	system("mount %s %s -o rw,sync" % (dev, usbmountpoint))
+	session.open(NFIDownload,usbmountpoint)
 
 def filescan(**kwargs):
 	from Components.Scanner import Scanner, ScanPath
diff --git a/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py b/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py
index e1f3e1de..896d9f2c 100755
--- a/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py
@@ -261,9 +261,6 @@ class UpdatePluginMenu(Screen):
 					for x in parts:
 						if not access(x[1], F_OK|R_OK|W_OK) or x[1] == '/':
 							parts.remove(x)
-					for x in parts:
-						if x[1].startswith('/autofs/'):
-							parts.remove(x)
 					if len(parts):
 						self.session.openWithCallback(self.backuplocation_choosen, ChoiceBox, title = _("Please select medium to use as backup location"), list = parts)
 				elif (currentEntry == "backupfiles"):
@@ -278,14 +275,20 @@ class UpdatePluginMenu(Screen):
 
 	def backupfiles_choosen(self, ret):
 		self.backupdirs = ' '.join( config.plugins.configurationbackup.backupdirs.value )
-
+		config.plugins.configurationbackup.backupdirs.save()
+		config.plugins.configurationbackup.save()
+		config.save()
+		
 	def backuplocation_choosen(self, option):
+		oldpath = config.plugins.configurationbackup.backuplocation.getValue()
 		if option is not None:
 			config.plugins.configurationbackup.backuplocation.value = str(option[1])
 		config.plugins.configurationbackup.backuplocation.save()
 		config.plugins.configurationbackup.save()
 		config.save()
-		self.createBackupfolders()
+		newpath = config.plugins.configurationbackup.backuplocation.getValue()
+		if newpath != oldpath:
+			self.createBackupfolders()
 
 	def runUpgrade(self, result):
 		if result:
@@ -1335,9 +1338,9 @@ class UpdatePlugin(Screen):
 		self["slider"] = self.slider
 		self.activityslider = Slider(0, 100)
 		self["activityslider"] = self.activityslider
-		self.status = StaticText(_("Upgrading Dreambox... Please wait"))
+		self.status = StaticText(_("Please wait..."))
 		self["status"] = self.status
-		self.package = StaticText()
+		self.package = StaticText(_("Verifying your internet connection..."))
 		self["package"] = self.package
 		self.oktext = _("Press OK on your remote control to continue.")
 
@@ -1348,20 +1351,35 @@ class UpdatePlugin(Screen):
 		self.activity = 0
 		self.activityTimer = eTimer()
 		self.activityTimer.callback.append(self.doActivityTimer)
-		self.activityTimer.start(100, False)
 
 		self.ipkg = IpkgComponent()
 		self.ipkg.addCallback(self.ipkgCallback)
 
-		self.updating = True
-		self.package.setText(_("Package list update"))
-		self.ipkg.startCmd(IpkgComponent.CMD_UPDATE)
+		self.updating = False
 
 		self["actions"] = ActionMap(["WizardActions"], 
 		{
 			"ok": self.exit,
 			"back": self.exit
 		}, -1)
+		
+		iNetwork.checkNetworkState(self.checkNetworkCB)
+		self.onClose.append(self.cleanup)
+		
+	def cleanup(self):
+		iNetwork.stopPingConsole()
+
+	def checkNetworkCB(self,data):
+		if data is not None:
+			if data <= 2:
+				self.updating = True
+				self.activityTimer.start(100, False)
+				self.package.setText(_("Package list update"))
+				self.status.setText(_("Upgrading Dreambox... Please wait"))
+				self.ipkg.startCmd(IpkgComponent.CMD_UPDATE)
+			else:
+				self.package.setText(_("Your network is not working. Please try again."))
+				self.status.setText(self.oktext)
 
 	def doActivityTimer(self):
 		self.activity += 1
@@ -1440,6 +1458,9 @@ class UpdatePlugin(Screen):
 				self.session.openWithCallback(self.exitAnswer, MessageBox, _("Upgrade finished.") +" "+_("Do you want to reboot your Dreambox?"))
 			else:
 				self.close()
+		else:
+			if not self.updating:
+				self.close()
 
 	def exitAnswer(self, result):
 		if result is not None and result:
diff --git a/lib/python/Tools/NumericalTextInput.py b/lib/python/Tools/NumericalTextInput.py
index da090b13..63a58ea4 100644
--- a/lib/python/Tools/NumericalTextInput.py
+++ b/lib/python/Tools/NumericalTextInput.py
@@ -31,19 +31,19 @@ class NumericalTextInput:
 			return
 
 		if self.lang == 'de_DE':
-			self.mapping.append (u".,?'+\"0-()@/:_$!=") # 0
-			self.mapping.append (u" 1") # 1
-			self.mapping.append (u"aäbc2AÄBC") # 2
+			self.mapping.append (u"0,?!&@=*'+\"()$~") # 0
+			self.mapping.append (u" 1.:/-_") # 1
+			self.mapping.append (u"abcä2ABCÄ") # 2
 			self.mapping.append (u"def3DEF") # 3
 			self.mapping.append (u"ghi4GHI") # 4
 			self.mapping.append (u"jkl5JKL") # 5
 			self.mapping.append (u"mnoö6MNOÖ") # 6
 			self.mapping.append (u"pqrsß7PQRSß") # 7
-			self.mapping.append (u"tuüv8TUÜV") # 8
+			self.mapping.append (u"tuvü8TUVÜ") # 8
 			self.mapping.append (u"wxyz9WXYZ") # 9
 		elif self.lang == 'es_ES':
-			self.mapping.append (u".,?'+\"0-()@/:_$!=") # 0
-			self.mapping.append (u" 1") # 1
+			self.mapping.append (u"0,?!&@=*'+\"()$~") # 0
+			self.mapping.append (u" 1.:/-_") # 1
 			self.mapping.append (u"abcáà2ABCÁÀ") # 2
 			self.mapping.append (u"deéèf3DEFÉÈ") # 3
 			self.mapping.append (u"ghiíì4GHIÍÌ") # 4
@@ -53,8 +53,8 @@ class NumericalTextInput:
 			self.mapping.append (u"tuvúù8TUVÚÙ") # 8
 			self.mapping.append (u"wxyz9WXYZ") # 9
 		if self.lang in ('sv_SE', 'fi_FI'):
-			self.mapping.append (u".,?'+\"0-()@/:_$!=") # 0
-			self.mapping.append (u" 1") # 1
+			self.mapping.append (u"0,?!&@=*'+\"()$~") # 0
+			self.mapping.append (u" 1.:/-_") # 1
 			self.mapping.append (u"abcåä2ABCÅÄ") # 2
 			self.mapping.append (u"defé3DEFÉ") # 3
 			self.mapping.append (u"ghi4GHI") # 4
@@ -64,8 +64,8 @@ class NumericalTextInput:
 			self.mapping.append (u"tuv8TUV") # 8
 			self.mapping.append (u"wxyz9WXYZ") # 9
 		else:
-			self.mapping.append (u".,?'+\"0-()@/:_$!=") # 0
-			self.mapping.append (u" 1") # 1
+			self.mapping.append (u"0,?!&@=*'+\"()$~") # 0
+			self.mapping.append (u" 1.:/-_") # 1
 			self.mapping.append (u"abc2ABC") # 2
 			self.mapping.append (u"def3DEF") # 3
 			self.mapping.append (u"ghi4GHI") # 4
diff --git a/lib/service/iservice.h b/lib/service/iservice.h
index 2ba7cb46..7f582495 100644
--- a/lib/service/iservice.h
+++ b/lib/service/iservice.h
@@ -289,6 +289,7 @@ public:
 		sFileSize,
 
 		sCAIDs,
+		sCAIDPIDs,
 		sVideoType, 		/* MPEG2 MPEG4 */
 
 		sTags,  			/* space seperated list of tags */
diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index 0d617c30..6a464aff 100644
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -309,7 +309,9 @@ eStaticServiceDVBPVRInformation::eStaticServiceDVBPVRInformation(const eServiceR
 RESULT eStaticServiceDVBPVRInformation::getName(const eServiceReference &ref, std::string &name)
 {
 	ASSERT(ref == m_ref);
-	if (m_parser.m_name.size())
+	if (!ref.name.empty())
+		name = ref.name;
+	else if (!m_parser.m_name.empty())
 		name = m_parser.m_name;
 	else
 	{
@@ -1589,7 +1591,7 @@ int eDVBServicePlay::getInfo(int w)
 {
 	eDVBServicePMTHandler::program program;
 
-	if (w == sCAIDs)
+	if (w == sCAIDs || w == sCAIDPIDs)
 		return resIsPyObject;
 
 	eDVBServicePMTHandler &h = m_timeshift_active ? m_service_handler_timeshift : m_service_handler;
@@ -1730,6 +1732,8 @@ PyObject *eDVBServicePlay::getInfoObject(int w)
 	{
 	case sCAIDs:
 		return m_service_handler.getCaIds();
+	case sCAIDPIDs:
+		return m_service_handler.getCaIds(true);
 	case sTransponderData:
 		return eStaticServiceDVBInformation().getInfoObject(m_reference, w);
 	default: