timer-add-support

diff --git a/lib/python/Screens/TimerEdit.py b/lib/python/Screens/TimerEdit.py
index 0a9f28307f99c8e082a966dfbc8c8b95c8ec37b3..233bfe2d3000d5e2d73b4e785f24713d004cf26c 100644 (file)
--- a/lib/python/Screens/TimerEdit.py
+++ b/lib/python/Screens/TimerEdit.py
@@ -6,6 +6,9 @@ from Components.Label import Label
 from Components.Button import Button
 from Components.TextInput import TextInput
 from TimerEntry import TimerEntry
 from Components.Button import Button
 from Components.TextInput import TextInput
 from TimerEntry import TimerEntry

+from RecordTimer import RecordTimerEntry
+from time import *
+from ServiceReference import ServiceReference

 
 class TimerEdit(Screen):
        def __init__(self, session, entry):
 
 class TimerEdit(Screen):
        def __init__(self, session, entry):


@@ -81,7 +84,36 @@ class TimerEditList(Screen):
                #self.session.open(TimerEdit, self["timerlist"].getCurrent()[0])
                
        def removeTimer(self):
                #self.session.open(TimerEdit, self["timerlist"].getCurrent()[0])
                
        def removeTimer(self):

-               pass
+               self.session.nav.RecordTimer.removeEntry(self["timerlist"].getCurrent()[0])

        
        def addTimer(self):
        
        def addTimer(self):

-               pass
+               begin = time()
+               end = time() + 60
+               
+               epg = None
+               try:
+                       service = self.session.nav.getCurrentService()
+                       info = service.info()
+                       ev = info.getEvent(0)
+                       epg = ev
+               except:
+                       pass
+               
+               if (epg == None):
+                       description = "unknown event"
+               else:
+                       description = ev.getEventName()
+                       # FIXME we need a timestamp here:
+                       begin = ev.getBeginTime()
+                       
+                       print begin
+                       print ev.getDuration()
+                       end = begin + ev.getDuration()
+
+
+               # FIXME only works if already playing a service
+               serviceref = ServiceReference(self.session.nav.getCurrentlyPlayingServiceReference())
+               
+               newEntry = RecordTimerEntry(begin, end, serviceref, epg, description)
+               self.session.open(TimerEntry, newEntry)
+               

diff --git a/lib/service/event.h b/lib/service/event.h
index 3a71f7b732732dadff6d1263ec86e02b42640c5f..cbce6f175bd6c6b508ff0313f7c53e6760a1e789 100644 (file)
--- a/lib/service/event.h
+++ b/lib/service/event.h
@@ -21,7 +21,7 @@ public:
        bool loadLanguage(Event *event, std::string lang);
        RESULT parseFrom(Event *evt);
 #endif
        bool loadLanguage(Event *event, std::string lang);
        RESULT parseFrom(Event *evt);
 #endif

-       time_t getBeginTime() { return m_begin; }
+       long getBeginTime() { return (long)m_begin; }

        int getDuration() { return m_duration; }
        std::string getEventName() { return m_event_name; }
        std::string getShortDescription() { return m_short_description; }
        int getDuration() { return m_duration; }
        std::string getEventName() { return m_event_name; }
        std::string getShortDescription() { return m_short_description; }