X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/7cdca2a2cfb44ad34a3b36fb589f02b861c411c3..892b126f25f6adf5856fa1caa01d998f1e53afac:/lib/python/Screens/ChannelSelection.py

diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
index c50d82bc..b509b1a4 100644
--- a/lib/python/Screens/ChannelSelection.py
+++ b/lib/python/Screens/ChannelSelection.py
@@ -61,13 +61,14 @@ OFF = 0
 EDIT_BOUQUET = 1
 EDIT_ALTERNATIVES = 2
 
-def apend_when_current_valid(current, menu, args):
+def append_when_current_valid(current, menu, args):
 	if current and current.valid():
 		menu.append(args)
 
 class ChannelContextMenu(Screen):
 	def __init__(self, session, csel):
 		Screen.__init__(self, session)
+		#raise "we need a better summary screen here"
 		self.csel = csel
 		self.bsel = None
 
@@ -87,63 +88,63 @@ class ChannelContextMenu(Screen):
 		haveBouquets = config.usage.multibouquet.value
 
 		if not (len(current_sel_path) or current_sel_flags & (eServiceReference.isDirectory|eServiceReference.isMarker)):
-			apend_when_current_valid(current, menu, (_("show transponder info"), self.showServiceInformations))
+			append_when_current_valid(current, menu, (_("show transponder info"), self.showServiceInformations))
 		if csel.bouquet_mark_edit == OFF and not csel.movemode:
 			if not inBouquetRootList:
 				isPlayable = not (current_sel_flags & (eServiceReference.isMarker|eServiceReference.isDirectory))
 				if isPlayable:
 					if config.ParentalControl.configured.value:
 						if parentalControl.getProtectionLevel(csel.getCurrentSelection().toCompareString()) == -1:
-							apend_when_current_valid(current, menu, (_("add to parental protection"), boundFunction(self.addParentalProtection, csel.getCurrentSelection())))
+							append_when_current_valid(current, menu, (_("add to parental protection"), boundFunction(self.addParentalProtection, csel.getCurrentSelection())))
 						else:
-							apend_when_current_valid(current, menu, (_("remove from parental protection"), boundFunction(self.removeParentalProtection, csel.getCurrentSelection())))
+							append_when_current_valid(current, menu, (_("remove from parental protection"), boundFunction(self.removeParentalProtection, csel.getCurrentSelection())))
 					if haveBouquets:
-						apend_when_current_valid(current, menu, (_("add service to bouquet"), self.addServiceToBouquetSelected))
+						append_when_current_valid(current, menu, (_("add service to bouquet"), self.addServiceToBouquetSelected))
 					else:
-						apend_when_current_valid(current, menu, (_("add service to favourites"), self.addServiceToBouquetSelected))
+						append_when_current_valid(current, menu, (_("add service to favourites"), self.addServiceToBouquetSelected))
 				else:
 					if haveBouquets:
 						if not inBouquet and current_sel_path.find("PROVIDERS") == -1:
-							apend_when_current_valid(current, menu, (_("copy to bouquets"), self.copyCurrentToBouquetList))
+							append_when_current_valid(current, menu, (_("copy to bouquets"), self.copyCurrentToBouquetList))
 					if current_sel_path.find("flags == %d" %(FLAG_SERVICE_NEW_FOUND)) != -1:
-						apend_when_current_valid(current, menu, (_("remove all new found flags"), self.removeAllNewFoundFlags))
+						append_when_current_valid(current, menu, (_("remove all new found flags"), self.removeAllNewFoundFlags))
 				if inBouquet:
-					apend_when_current_valid(current, menu, (_("remove entry"), self.removeCurrentService))
+					append_when_current_valid(current, menu, (_("remove entry"), self.removeCurrentService))
 				if current_root and current_root.getPath().find("flags == %d" %(FLAG_SERVICE_NEW_FOUND)) != -1:
-					apend_when_current_valid(current, menu, (_("remove new found flag"), self.removeNewFoundFlag))
+					append_when_current_valid(current, menu, (_("remove new found flag"), self.removeNewFoundFlag))
 			else:
 					menu.append((_("add bouquet"), self.showBouquetInputBox))
-					apend_when_current_valid(current, menu, (_("remove entry"), self.removeBouquet))
+					append_when_current_valid(current, menu, (_("remove entry"), self.removeBouquet))
 
 		if inBouquet: # current list is editable?
 			if csel.bouquet_mark_edit == OFF:
 				if not csel.movemode:
-					apend_when_current_valid(current, menu, (_("enable move mode"), self.toggleMoveMode))
+					append_when_current_valid(current, menu, (_("enable move mode"), self.toggleMoveMode))
 					if not inBouquetRootList and current_root and not (current_root.flags & eServiceReference.isGroup):
 						menu.append((_("add marker"), self.showMarkerInputBox))
 						if haveBouquets:
-							apend_when_current_valid(current, menu, (_("enable bouquet edit"), self.bouquetMarkStart))
+							append_when_current_valid(current, menu, (_("enable bouquet edit"), self.bouquetMarkStart))
 						else:
-							apend_when_current_valid(current, menu, (_("enable favourite edit"), self.bouquetMarkStart))
+							append_when_current_valid(current, menu, (_("enable favourite edit"), self.bouquetMarkStart))
 						if current_sel_flags & eServiceReference.isGroup:
-							apend_when_current_valid(current, menu, (_("edit alternatives"), self.editAlternativeServices))
-							apend_when_current_valid(current, menu, (_("show alternatives"), self.showAlternativeServices))
-							apend_when_current_valid(current, menu, (_("remove all alternatives"), self.removeAlternativeServices))
+							append_when_current_valid(current, menu, (_("edit alternatives"), self.editAlternativeServices))
+							append_when_current_valid(current, menu, (_("show alternatives"), self.showAlternativeServices))
+							append_when_current_valid(current, menu, (_("remove all alternatives"), self.removeAlternativeServices))
 						elif not current_sel_flags & eServiceReference.isMarker:
-							apend_when_current_valid(current, menu, (_("add alternatives"), self.addAlternativeServices))
+							append_when_current_valid(current, menu, (_("add alternatives"), self.addAlternativeServices))
 				else:
-					apend_when_current_valid(current, menu, (_("disable move mode"), self.toggleMoveMode))
+					append_when_current_valid(current, menu, (_("disable move mode"), self.toggleMoveMode))
 			else:
 				if csel.bouquet_mark_edit == EDIT_BOUQUET:
 					if haveBouquets:
-						apend_when_current_valid(current, menu, (_("end bouquet edit"), self.bouquetMarkEnd))
-						apend_when_current_valid(current, menu, (_("abort bouquet edit"), self.bouquetMarkAbort))
+						append_when_current_valid(current, menu, (_("end bouquet edit"), self.bouquetMarkEnd))
+						append_when_current_valid(current, menu, (_("abort bouquet edit"), self.bouquetMarkAbort))
 					else:
-						apend_when_current_valid(current, menu, (_("end favourites edit"), self.bouquetMarkEnd))
-						apend_when_current_valid(current, menu, (_("abort favourites edit"), self.bouquetMarkAbort))
+						append_when_current_valid(current, menu, (_("end favourites edit"), self.bouquetMarkEnd))
+						append_when_current_valid(current, menu, (_("abort favourites edit"), self.bouquetMarkAbort))
 				else:
-						apend_when_current_valid(current, menu, (_("end alternatives edit"), self.bouquetMarkEnd))
-						apend_when_current_valid(current, menu, (_("abort alternatives edit"), self.bouquetMarkAbort))
+						append_when_current_valid(current, menu, (_("end alternatives edit"), self.bouquetMarkEnd))
+						append_when_current_valid(current, menu, (_("abort alternatives edit"), self.bouquetMarkAbort))
 
 		menu.append((_("back"), self.cancelClick))
 		self["menu"] = MenuList(menu)
@@ -1316,9 +1317,6 @@ class ChannelSelectionRadio(ChannelSelectionBase, ChannelSelectionEdit, ChannelS
 		ChannelSelectionEdit.__init__(self)
 		ChannelSelectionEPG.__init__(self)
 		self.infobar = infobar
-		config.radio = ConfigSubsection();
-		config.radio.lastservice = ConfigText()
-		config.radio.lastroot = ConfigText()
 		self.onLayoutFinish.append(self.onCreate)
 
 		self.info = session.instantiateDialog(RadioInfoBar) # our simple infobar
@@ -1421,6 +1419,8 @@ class ChannelSelectionRadio(ChannelSelectionBase, ChannelSelectionEdit, ChannelS
 		if lastservice.valid():
 			self.servicelist.setCurrent(lastservice)
 			self.session.nav.playService(lastservice)
+		else:
+			self.session.nav.stopService()
 		self.info.show()
 
 	def channelSelected(self): # just return selected service