X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/e4e4d2b588a0f82e1b0c0278e3ef8ff442277a54..2a8ecd871020fdd668cf5500460e5a6e7851b4b0:/lib/python/Plugins/Extensions/CutListEditor/plugin.py

diff --git a/lib/python/Plugins/Extensions/CutListEditor/plugin.py b/lib/python/Plugins/Extensions/CutListEditor/plugin.py
index 4c425532..4c520689 100644
--- a/lib/python/Plugins/Extensions/CutListEditor/plugin.py
+++ b/lib/python/Plugins/Extensions/CutListEditor/plugin.py
@@ -4,7 +4,6 @@ from Screens.Screen import Screen
 from Screens.MessageBox import MessageBox
 from Components.ServicePosition import ServicePositionGauge
 from Components.ActionMap import HelpableActionMap
-from Components.MenuList import MenuList
 from Components.MultiContent import MultiContentEntryText
 from Components.ServiceEventTracker import ServiceEventTracker
 from Components.VideoWindow import VideoWindow
@@ -122,6 +121,10 @@ class CutList(GUIComponent):
 		instance.setItemHeight(30)
 		instance.selectionChanged.get().append(self.selectionChanged)
 
+	def preWidgetRemove(self, instance):
+		instance.setContent(None)
+		instance.selectionChanged.get().remove(self.selectionChanged)
+
 	def selectionChanged(self):
 		for x in self.onSelectionChanged:
 			x()
@@ -155,11 +158,11 @@ class CutListEditor(Screen, InfoBarSeek, InfoBarCueSheetSupport, InfoBarServiceN
 
 			<widget source="CurrentService" render="Label" position="370,278" size="340,25" 
 				backgroundColor="#000000" foregroundColor="#ffffff" font="Regular;19" zPosition="1" >
-				<convert type="ServicePosition">PositionDetailed</convert>
+				<convert type="ServicePosition">Position,Detailed</convert>
 			</widget>
 
 			<widget name="Timeline" position="50,500" size="620,40" backgroundColor="#000000"
-				pointer="/usr/share/enigma2/position_pointer.png:3,5" foregroundColor="#ffffff" />
+				pointer="/usr/share/enigma2/skin_default/position_arrow.png:3,5" foregroundColor="#ffffff" />
 			<widget name="Cutlist" position="50,325" size="620,175" scrollbarMode="showOnDemand" transparent="1" />
 		</screen>"""
 	def __init__(self, session, service):
@@ -390,10 +393,10 @@ Then seek to the end, press OK, select 'end cut'. That's it.
 			bisect.insort(self.cut_list, (self.context_position, 1))
 			self.uploadCuesheet()
 
-	# we modify the "play" behaviour a bit:
+	# we modify the "play" behavior a bit:
 	# if we press pause while being in slowmotion, we will pause (and not play)
 	def playpauseService(self):
-		if self.seekstate not in [self.SEEK_STATE_PLAY, self.SEEK_STATE_SM_HALF, self.SEEK_STATE_SM_QUARTER, self.SEEK_STATE_SM_EIGHTH]:
+		if self.seekstate != self.SEEK_STATE_PLAY and not self.isStateSlowMotion(self.seekstate):
 			self.unPauseService()
 		else:
 			self.pauseService()