disable debug

[enigma2.git] / RecordTimer.py

diff --git a/RecordTimer.py b/RecordTimer.py
index c9c8fe9e444e5b5242a0cf33c1a816aabf886d18..1c707c362ca897f64984764a8c29a309c7eb0577 100644 (file)
--- a/RecordTimer.py
+++ b/RecordTimer.py
@@ -164,23 +164,26 @@ class RecordTimerEntry(timer.TimerEntry, object):
                                self.log(1, "'record service' failed")
                                return False
 
-                       event_id = self.eit
-                       if event_id is None:
-                               event_id = -1
-                               
-                       prep_res=self.record_service.prepare(self.Filename + ".ts", self.begin, self.end, event_id)
-                       if prep_res:
-                               self.log(2, "'prepare' failed: error %d" % prep_res)
-                               NavigationInstance.instance.stopRecordService(self.record_service)
-                               self.record_service = None
-                               return False
-                               
                        if self.repeated:
                                epgcache = eEPGCache.getInstance()
                                queryTime=self.begin+(self.end-self.begin)/2
                                evt = epgcache.lookupEventTime(rec_ref, queryTime)
                                if evt:
                                        self.description = evt.getShortDescription()
+                                       event_id = evt.getEventId()
+                               else:
+                                       event_id = -1
+                       else:
+                               event_id = self.eit
+                               if event_id is None:
+                                       event_id = -1
+
+                       prep_res=self.record_service.prepare(self.Filename + ".ts", self.begin, self.end, event_id)
+                       if prep_res:
+                               self.log(2, "'prepare' failed: error %d" % prep_res)
+                               NavigationInstance.instance.stopRecordService(self.record_service)
+                               self.record_service = None
+                               return False
 
                        self.log(3, "prepare ok, writing meta information to %s" % self.Filename)
                        try:
@@ -313,7 +316,7 @@ class RecordTimerEntry(timer.TimerEntry, object):
 
        def gotRecordEvent(self, record, event):
                # TODO: this is not working (never true), please fix. (comparing two swig wrapped ePtrs)
-               if self.__record_service != record:
+               if self.__record_service.__deref__() != record.__deref__():
                        return
                self.log(16, "record event %d" % event)
                if event == iRecordableService.evRecordWriteError:
@@ -327,7 +330,7 @@ class RecordTimerEntry(timer.TimerEntry, object):
                        # TODO: this has to be done.
                elif event == iRecordableService.evStart:
                        # maybe this should be configurable?
-                       Notifications.AddPopup(text = _("A record has been started:\n%s") % self.description, type = MessageBox.TYPE_INFO, timeout = 3)
+                       Notifications.AddPopup(text = _("A record has been started:\n%s") % self.name, type = MessageBox.TYPE_INFO, timeout = 3)
 
        # we have record_service as property to automatically subscribe to record service events
        def setRecordService(self, service):