Menu
▾
▴
[Freevo-cvslog] r11641 - branches/rel-1/freevo branches/rel-1/freevo/src/tv/plugins/livepause tags/REL-1_9_1/freevo tags/REL-1_9_1/freevo/src/tv/plugins/livepause
|
From: Duncan W. <du...@fr...> - 2010-01-17 12:48:28
|
Author: duncan
Date: Sun Jan 17 07:47:50 2010
New Revision: 11641
Log:
Live recording with livepause not working B#2888365
Patch from m0y applied
Modified:
branches/rel-1/freevo/ChangeLog
branches/rel-1/freevo/src/tv/plugins/livepause/__init__.py
branches/rel-1/freevo/src/tv/plugins/livepause/backend.py
branches/rel-1/freevo/src/tv/plugins/livepause/record.py
tags/REL-1_9_1/freevo/ChangeLog
tags/REL-1_9_1/freevo/src/tv/plugins/livepause/__init__.py
tags/REL-1_9_1/freevo/src/tv/plugins/livepause/backend.py
tags/REL-1_9_1/freevo/src/tv/plugins/livepause/record.py
Modified: branches/rel-1/freevo/ChangeLog
==============================================================================
--- branches/rel-1/freevo/ChangeLog (original)
+++ branches/rel-1/freevo/ChangeLog Sun Jan 17 07:47:50 2010
@@ -30,6 +30,7 @@
* Fixed ivtv control name changes (B#2801870)
* Fixed livepause back-end when the buffer overflows freevo stops respond (B#2830288)
* Fixed livepause incorrect function (B#2808038)
+ * Fixed livepause not working with live recording (B#2888365)
* Fixed livepause plug-in when the TV_CHANNELS have varying number of items (B#2808035)
* Fixed plugins helper creating incorrect plug-in name (B#2824746)
* Fixed TV guide swapping the OK and Cancel buttons (B#2904179)
Modified: branches/rel-1/freevo/src/tv/plugins/livepause/__init__.py
==============================================================================
--- branches/rel-1/freevo/src/tv/plugins/livepause/__init__.py (original)
+++ branches/rel-1/freevo/src/tv/plugins/livepause/__init__.py Sun Jan 17 07:47:50 2010
@@ -435,7 +435,7 @@
def __playing_tv_record(self, event, menuw):
if self.recording:
- self.backend.cancel_save()
+ self.backend.cancelsave()
self.recording = False
else:
self.recording = True
Modified: branches/rel-1/freevo/src/tv/plugins/livepause/backend.py
==============================================================================
--- branches/rel-1/freevo/src/tv/plugins/livepause/backend.py (original)
+++ branches/rel-1/freevo/src/tv/plugins/livepause/backend.py Sun Jan 17 07:47:50 2010
@@ -329,7 +329,7 @@
def cancelsave(self):
if self.livepause_app:
- self.livepause_app.cancelsave()
+ self.livepause_app.cancel_save()
def send_event(self, to_send):
to_send.post()
Modified: branches/rel-1/freevo/src/tv/plugins/livepause/record.py
==============================================================================
--- branches/rel-1/freevo/src/tv/plugins/livepause/record.py (original)
+++ branches/rel-1/freevo/src/tv/plugins/livepause/record.py Sun Jan 17 07:47:50 2010
@@ -63,10 +63,10 @@
filename_array = { 'progname': String('Manual Recording'),
'title' : String('') }
start_time = buffer_info[3]
- end_time = current_buffer_time + config.LIVE_PAUSE2_INSTANT_RECORD_LENGTH
+ end_time = start_time + config.LIVE_PAUSE2_INSTANT_RECORD_LENGTH
filemask = config.TV_RECORD_FILE_MASK % filename_array
- filemask = time.strftime(filemask, time.localtime(current_buffer_time))
+ filemask = time.strftime(filemask, time.localtime(start_time))
filename = os.path.join(config.TV_RECORD_DIR, progname2filename(filemask).rstrip(' -_:') + \
config.TV_RECORD_FILE_SUFFIX)
@@ -83,7 +83,7 @@
channels = epg_xmltv.get_guide().get_programs(start=current_time,
stop=current_time,
- channel_id=[channel_id])
+ channel_id=channel_id)
if channels and channels[0] and channels[0].programs:
return channels[0].programs[0]
Modified: tags/REL-1_9_1/freevo/ChangeLog
==============================================================================
--- tags/REL-1_9_1/freevo/ChangeLog (original)
+++ tags/REL-1_9_1/freevo/ChangeLog Sun Jan 17 07:47:50 2010
@@ -30,6 +30,7 @@
* Fixed ivtv control name changes (B#2801870)
* Fixed livepause back-end when the buffer overflows freevo stops respond (B#2830288)
* Fixed livepause incorrect function (B#2808038)
+ * Fixed livepause not working with live recording (B#2888365)
* Fixed livepause plug-in when the TV_CHANNELS have varying number of items (B#2808035)
* Fixed plugins helper creating incorrect plug-in name (B#2824746)
Modified: tags/REL-1_9_1/freevo/src/tv/plugins/livepause/__init__.py
==============================================================================
--- tags/REL-1_9_1/freevo/src/tv/plugins/livepause/__init__.py (original)
+++ tags/REL-1_9_1/freevo/src/tv/plugins/livepause/__init__.py Sun Jan 17 07:47:50 2010
@@ -435,7 +435,7 @@
def __playing_tv_record(self, event, menuw):
if self.recording:
- self.backend.cancel_save()
+ self.backend.cancelsave()
self.recording = False
else:
self.recording = True
Modified: tags/REL-1_9_1/freevo/src/tv/plugins/livepause/backend.py
==============================================================================
--- tags/REL-1_9_1/freevo/src/tv/plugins/livepause/backend.py (original)
+++ tags/REL-1_9_1/freevo/src/tv/plugins/livepause/backend.py Sun Jan 17 07:47:50 2010
@@ -329,7 +329,7 @@
def cancelsave(self):
if self.livepause_app:
- self.livepause_app.cancelsave()
+ self.livepause_app.cancel_save()
def send_event(self, to_send):
to_send.post()
Modified: tags/REL-1_9_1/freevo/src/tv/plugins/livepause/record.py
==============================================================================
--- tags/REL-1_9_1/freevo/src/tv/plugins/livepause/record.py (original)
+++ tags/REL-1_9_1/freevo/src/tv/plugins/livepause/record.py Sun Jan 17 07:47:50 2010
@@ -63,10 +63,10 @@
filename_array = { 'progname': String('Manual Recording'),
'title' : String('') }
start_time = buffer_info[3]
- end_time = current_buffer_time + config.LIVE_PAUSE2_INSTANT_RECORD_LENGTH
+ end_time = start_time + config.LIVE_PAUSE2_INSTANT_RECORD_LENGTH
filemask = config.TV_RECORD_FILE_MASK % filename_array
- filemask = time.strftime(filemask, time.localtime(current_buffer_time))
+ filemask = time.strftime(filemask, time.localtime(start_time))
filename = os.path.join(config.TV_RECORD_DIR, progname2filename(filemask).rstrip(' -_:') + \
config.TV_RECORD_FILE_SUFFIX)
@@ -83,7 +83,7 @@
channels = epg_xmltv.get_guide().get_programs(start=current_time,
stop=current_time,
- channel_id=[channel_id])
+ channel_id=channel_id)
if channels and channels[0] and channels[0].programs:
return channels[0].programs[0]
|