Author: duncan
Date: Tue Jul 10 13:56:52 2007
New Revision: 9752
Log:
Made VCR_CMD accept a list or a tuple instead of just a string
Fix for childapp using subprocess
Modified:
branches/rel-1/freevo/src/tv/plugins/generic_record.py
branches/rel-1/freevo/src/tv/plugins/vbi2srt_record.py
Modified: branches/rel-1/freevo/src/tv/plugins/generic_record.py
==============================================================================
--- branches/rel-1/freevo/src/tv/plugins/generic_record.py (original)
+++ branches/rel-1/freevo/src/tv/plugins/generic_record.py Tue Jul 10
13:56:52 2007
@@ -87,7 +87,12 @@
'pdc-start' : rec_prog.pdc_start,
}
- self.rec_command = config.VCR_CMD % cl_options
+ if isinstance(config.VCR_CMD, str) or isinstance(config.VCR_CMD,
unicode):
+ self.rec_command = config.VCR_CMD % cl_options
+ elif isinstance(config.VCR_CMD, list) or isinstance(config.VCR_CMD,
tuple):
+ self.rec_command = []
+ for arg in config.VCR_CMD:
+ self.rec_command.append(arg % cl_options)
self.thread.mode = 'record'
self.thread.prog = rec_prog
Modified: branches/rel-1/freevo/src/tv/plugins/vbi2srt_record.py
==============================================================================
--- branches/rel-1/freevo/src/tv/plugins/vbi2srt_record.py (original)
+++ branches/rel-1/freevo/src/tv/plugins/vbi2srt_record.py Tue Jul 10
13:56:52 2007
@@ -144,14 +144,24 @@
except:
pagenum = None;
_debug_('Recorder::Record:pagenum "%s"' % pagenum)
- self.rec_command = config.VCR_CMD % cl_options
- if pagenum == None:
- self.rec_command = 'vbi2srt --verbose --video-in=%s --video-out=%s
--vbi-device=%s --seconds=%s --vps=%s' % \
- (self.vg.vdev, rec_prog.filename, self.vg.vvbi,
rec_prog.rec_duration, rec_prog.pdc_start)
- else:
+
+ # this is not used
+ if isinstance(config.VCR_CMD, str) or isinstance(config.VCR_CMD,
unicode):
+ self.rec_command = config.VCR_CMD % cl_options
+ elif isinstance(config.VCR_CMD, list) or isinstance(config.VCR_CMD,
tuple):
+ self.rec_command = []
+ for arg in config.VCR_CMD:
+ self.rec_command.append(arg % cl_options)
+
+ if pagenum:
# there is a bug in vbi2srt that causes out of sync subtitles when
VPS is used
- self.rec_command = 'vbi2srt --verbose --video-in=%s --video-out=%s
--vbi-device=%s --seconds=%s --vps=%s --page=%s' % \
+ self.rec_command = \
+ 'vbi2srt --verbose --video-in=%s --video-out=%s
--vbi-device=%s --seconds=%s --vps=%s --page=%s' % \
(self.vg.vdev, rec_prog.filename, self.vg.vvbi,
rec_prog.rec_duration, rec_prog.pdc_start, pagenum)
+ else:
+ self.rec_command = \
+ 'vbi2srt --verbose --video-in=%s --video-out=%s
--vbi-device=%s --seconds=%s --vps=%s' % \
+ (self.vg.vdev, rec_prog.filename, self.vg.vvbi,
rec_prog.rec_duration, rec_prog.pdc_start)
self.thread.mode = 'record'
self.thread.prog = rec_prog
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
