X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/ef1a9823a5da0c626766dad7afc858e15b57a2d0..27af195d31298de858014931bdbe06fee1d244e4:/lib/python/Screens/ChannelSelection.py

diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
index 1e7f9f2a..57870212 100644
--- a/lib/python/Screens/ChannelSelection.py
+++ b/lib/python/Screens/ChannelSelection.py
@@ -112,6 +112,8 @@ class ChannelContextMenu(Screen):
 					else:
 						append_when_current_valid(current, menu, (_("add service to favourites"), self.addServiceToBouquetSelected), level = 0)
 				else:
+					if current_root.getPath().find('FROM SATELLITES') != -1:
+						append_when_current_valid(current, menu, (_("remove selected satellite"), self.removeSatelliteServices), level = 0)
 					if haveBouquets:
 						if not inBouquet and current_sel_path.find("PROVIDERS") == -1:
 							append_when_current_valid(current, menu, (_("copy to bouquets"), self.copyCurrentToBouquetList), level = 0)
@@ -205,6 +207,17 @@ class ChannelContextMenu(Screen):
 		if recursive:
 			self.close(False)
 
+	def removeSatelliteServices(self):
+		curpath = self.csel.getCurrentSelection().getPath()
+		idx = curpath.find("satellitePosition == ")
+		if idx != -1:
+			tmp = curpath[idx+21:]
+			idx = tmp.find(')')
+			if idx != -1:
+				satpos = int(tmp[:idx])
+				eDVBDB.getInstance().removeServices(-1, -1, -1, satpos)
+		self.close()
+
 	def copyCurrentToBouquetList(self):
 		self.csel.copyCurrentToBouquetList()
 		self.close()
@@ -1073,7 +1086,7 @@ class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit, ChannelSelect
 				"keyTV": self.setModeTv,
 			})
 
-		self.__event_tracker = ServiceEventTracker(screen=self, eventmap=
+		self.__event_tracker = ServiceEventTracker(screen=self, in_thread=True, eventmap=
 			{
 				iPlayableService.evStart: self.__evServiceStart,
 				iPlayableService.evEnd: self.__evServiceEnd
@@ -1343,7 +1356,7 @@ class ChannelSelectionRadio(ChannelSelectionBase, ChannelSelectionEdit, ChannelS
 				"ok": self.channelSelected,
 			})
 
-		self.__event_tracker = ServiceEventTracker(screen=self, eventmap=
+		self.__event_tracker = ServiceEventTracker(screen=self, in_thread=True, eventmap=
 			{
 				iPlayableService.evStart: self.__evServiceStart,
 				iPlayableService.evEnd: self.__evServiceEnd