Author: duncan
Date: Sat Oct 20 12:02:38 2007
New Revision: 10003
Log:
Changed VIDEO_GROUPS to TV_VIDEO_GROUPS
Updated convert_config to allow regular expressions, a bit slower
Modified:
branches/rel-1/freevo/freevo_config.py
branches/rel-1/freevo/src/helpers/convert_config.py
branches/rel-1/freevo/src/tv/channels.py
branches/rel-1/freevo/src/tv/plugins/ivtv_xine_tv.py
Modified: branches/rel-1/freevo/freevo_config.py
==============================================================================
--- branches/rel-1/freevo/freevo_config.py (original)
+++ branches/rel-1/freevo/freevo_config.py Sat Oct 20 12:02:38 2007
@@ -330,6 +330,7 @@
TV_RECORDFILE_MASK to TV_RECORD_FILE_MASK
TV_RECORDFILE_SUFFIX to TV_RECORD_FILE_SUFFIX
TV_RECORDFILE_OKLETTERS to TV_RECORD_FILE_OKLETTERS
+ VIDEO_GROUPS to TV_VIDEO_GROUPS
Added MIXER_VOLUME_STEP to allow the mixer volume change to be specified
Added for IVTV XINE TV:
XINE_TV_CONFIRM_STOP
@@ -1831,7 +1832,7 @@
# for viewing or recording. It will be possible to have different Freevo
# channels use different Video Groups.
-VIDEO_GROUPS = [
+TV_VIDEO_GROUPS = [
VideoGroup(vdev=TV_DEVICE,
adev=AUDIO_DEVICE,
input_type='tuner',
Modified: branches/rel-1/freevo/src/helpers/convert_config.py
==============================================================================
--- branches/rel-1/freevo/src/helpers/convert_config.py (original)
+++ branches/rel-1/freevo/src/helpers/convert_config.py Sat Oct 20 12:02:38 2007
@@ -117,6 +117,9 @@
'TV_RECORDFILE_MASK': 'TV_RECORD_FILE_MASK',
'TV_RECORDFILE_SUFFIX': 'TV_RECORD_FILE_SUFFIX',
'TV_RECORDFILE_OKLETTERS': 'TV_RECORD_FILE_OKLETTERS',
+ 'VIDEO_GROUPS': 'TV_VIDEO_GROUPS',
+ 'TV_TV_': 'TV_',
+ 'MIXER_MIXER_': 'MIXER_',
}
def help():
@@ -164,18 +167,17 @@
continue
for var in change_map:
- if line.find(var) >= 0 and \
- (line.startswith(var) or line[line.find(var)-1] in seperator)
and \
- line[line.find(var)+len(var)] in seperator:
+ repat = re.compile(var)
+ match = repat.match(line)
+ if match:
if print_name:
print '**** %s **** ' % file
print_name = False
- if out:
- line = line.replace(var, change_map[var])
+ line = re.sub(repat, change_map[var], line)
else:
print 'changing config file line:'
print line[:-1]
- print line[:-1].replace(var, change_map[var])
+ print re.sub(repat, change_map[var], line)[:-1]
print
if out:
out.write(line)
Modified: branches/rel-1/freevo/src/tv/channels.py
==============================================================================
--- branches/rel-1/freevo/src/tv/channels.py (original)
+++ branches/rel-1/freevo/src/tv/channels.py Sat Oct 20 12:02:38 2007
@@ -38,7 +38,7 @@
# Sample for local_conf.py:
# Three video cards and one web camera.
-#VIDEO_GROUPS = [
+#TV_VIDEO_GROUPS = [
# VideoGroup(vdev='/dev/video0',
# adev=None,
# input_type='tuner',
@@ -91,18 +91,18 @@
except: # XXX: put a better exception here
group = 0
if not isplayer:
- record_group = config.VIDEO_GROUPS[group].record_group
+ record_group = config.TV_VIDEO_GROUPS[group].record_group
if record_group:
try:
# some simple checks
group = int(record_group)
- record_vg = config.VIDEO_GROUPS[group]
+ record_vg = config.TV_VIDEO_GROUPS[group]
except:
- print 'VIDEO_GROUPS[%s].record_group=%s is invalid' %
(group, record_group)
+ print 'TV_VIDEO_GROUPS[%s].record_group=%s is invalid'
% (group, record_group)
finally:
self.lock.release()
- return config.VIDEO_GROUPS[group]
+ return config.TV_VIDEO_GROUPS[group]
def chanUp(self, isplayer, app=None, app_cmd=None):
Modified: branches/rel-1/freevo/src/tv/plugins/ivtv_xine_tv.py
==============================================================================
--- branches/rel-1/freevo/src/tv/plugins/ivtv_xine_tv.py (original)
+++ branches/rel-1/freevo/src/tv/plugins/ivtv_xine_tv.py Sat Oct 20
12:02:38 2007
@@ -224,7 +224,7 @@
PVR 250 card and adds S-VIDEO and Composite Inputs. Note that the
audio input is selected automatically by ivtv.
- | VIDEO_GROUPS = [
+ | TV_VIDEO_GROUPS = [
| VideoGroup(
| vdev='/dev/video0',
| adev=None,
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
