fix mark support, remove some debug

[enigma2.git] / lib / python / Screens / InfoBarGenerics.py

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index d6e5e3c7044257f51318d0db21eaebc90cf16602..308dcf1ec76cea862deb9fe8d28b32e6252a5e87 100644 (file)
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -945,7 +945,7 @@ class InfoBarInstantRecord:
                        })
                self.recording = None
                self["BlinkingPoint"] = BlinkingPixmapConditional()
-               self.onLayoutFinish.append(self["BlinkingPoint"].hideWidget)
+               self["BlinkingPoint"].hide()
                self["BlinkingPoint"].setConnect(self.session.nav.RecordTimer.isRecording)
 
        def stopCurrentRecording(self): 
@@ -1076,11 +1076,11 @@ class InfoBarAdditionalInfo:
                self.session.nav.event.append(self.gotServiceEvent) # we like to get service events
 
        def hideSubServiceIndication(self):
-               self["ButtonGreen"].hideWidget()
+               self["ButtonGreen"].hide()
                self["ButtonGreenText"].hide()
 
        def showSubServiceIndication(self):
-               self["ButtonGreen"].showWidget()
+               self["ButtonGreen"].show()
                self["ButtonGreenText"].show()
 
        def checkFormat(self, service):
@@ -1088,9 +1088,9 @@ class InfoBarAdditionalInfo:
                if info is not None:
                        aspect = info.getInfo(iServiceInformation.sAspect)
                        if aspect in [ 3, 4, 7, 8, 0xB, 0xC, 0xF, 0x10 ]:
-                               self["FormatActive"].showWidget()
+                               self["FormatActive"].show()
                        else:
-                               self["FormatActive"].hideWidget()
+                               self["FormatActive"].hide()
 
        def checkSubservices(self, service):
                if service.subServices().getNumberOfSubservices() > 0:
@@ -1111,17 +1111,17 @@ class InfoBarAdditionalInfo:
                                        dolby = True
                                        break
                if dolby:
-                       self["DolbyActive"].showWidget()
+                       self["DolbyActive"].show()
                else:
-                       self["DolbyActive"].hideWidget()
+                       self["DolbyActive"].hide()
 
        def checkCrypted(self, service):
                info = service.info()
                if info is not None:
                        if info.getInfo(iServiceInformation.sIsCrypted) > 0:
-                               self["CryptActive"].showWidget()
+                               self["CryptActive"].show()
                        else:
-                               self["CryptActive"].hideWidget()
+                               self["CryptActive"].hide()
 
        def gotServiceEvent(self, ev):
                service = self.session.nav.getCurrentService()
@@ -1133,9 +1133,9 @@ class InfoBarAdditionalInfo:
                        self.checkDolby(service)
                elif ev == iPlayableService.evEnd:
                        self.hideSubServiceIndication()
-                       self["CryptActive"].hideWidget()
-                       self["DolbyActive"].hideWidget()
-                       self["FormatActive"].hideWidget()
+                       self["CryptActive"].hide()
+                       self["DolbyActive"].hide()
+                       self["FormatActive"].hide()
 
 class InfoBarNotifications:
        def __init__(self):
@@ -1227,13 +1227,11 @@ class InfoBarCueSheetSupport:
                        seekable.seekTo(pts)
 
        def jumpPreviousMark(self):
-               print "jumpPreviousMark"
                # we add 2 seconds, so if the play position is <2s after
                # the mark, the mark before will be used
                self.jumpPreviousNextMark(lambda x: -x-5*90000, alternative=0)
 
        def jumpNextMark(self):
-               print "jumpNextMark"
                self.jumpPreviousNextMark(lambda x: x)
 
        def getNearestCutPoint(self, pts, cmp=abs):
@@ -1246,28 +1244,24 @@ class InfoBarCueSheetSupport:
                return nearest
 
        def toggleMark(self):
-               print "toggleMark"
                current_pos = self.__getCurrentPosition()
                if current_pos is None:
                        print "not seekable"
                        return
                
-               print "current position: ", current_pos
-
                nearest_cutpoint = self.getNearestCutPoint(current_pos)
-               print "nearest_cutpoint: ", nearest_cutpoint
                
                if nearest_cutpoint is not None and abs(nearest_cutpoint[0] - current_pos) < 5*90000:
-                       self.removeMark(self, *nearest_cutpoint)
+                       self.removeMark(nearest_cutpoint)
                else:
-                       self.addMark(self, current_pos, self.CUT_TYPE_MARK)
+                       self.addMark((current_pos, self.CUT_TYPE_MARK))
 
-       def addMark(self, where, type):
-               bisect.insort(self.cut_list, (current_pos, self.CUT_TYPE_MARK))
+       def addMark(self, point):
+               bisect.insort(self.cut_list, point)
                self.uploadCuesheet()
 
-       def removeMark(self, where, type):
-               self.cut_list.remove(nearest_cutpoint)
+       def removeMark(self, point):
+               self.cut_list.remove(point)
                self.uploadCuesheet()
 
        def __getCuesheet(self):
@@ -1291,5 +1285,3 @@ class InfoBarCueSheetSupport:
                        print "upload failed, no cuesheet interface"
                        return
                self.cut_list = cue.getCutList()
-
-               print "cuts:", self.cut_list