Author: duncan
Date: Wed Oct 17 16:44:37 2007
New Revision: 9996
Log:
A couple of more renamed variables
Modified:
branches/rel-1/freevo/freevo_config.py
branches/rel-1/freevo/src/helpers/convert_config.py
branches/rel-1/freevo/src/helpers/makestationlist.py
branches/rel-1/freevo/src/plugins/shutdown.py
branches/rel-1/freevo/src/tv/channels.py
branches/rel-1/freevo/src/tv/plugins/tvtime.py
branches/rel-1/freevo/src/tv/plugins/vbi2srt_record.py
branches/rel-1/freevo/src/tv/v4l2.py
branches/rel-1/freevo/src/www/htdocs/pluginconfig.rpy
Modified: branches/rel-1/freevo/freevo_config.py
==============================================================================
--- branches/rel-1/freevo/freevo_config.py (original)
+++ branches/rel-1/freevo/freevo_config.py Wed Oct 17 16:44:37 2007
@@ -318,6 +318,8 @@
VOLUME_MAX to MIXER_VOLUME_MAX
VOLUME_MIXER_DEV to MIXER_DEVICE
ENABLE_SHUTDOWN_SYS to SHUTDOWN_SYS_ENABLE
+ FREQUENCY_TABLE to TV_FREQUENCY_TABLE
+ CONFIRM_SHUTDOWN to SHUTDOWN_CONFIRM
Added MIXER_VOLUME_STEP to allow the mixer volume change to be specified
Added for IVTV XINE TV:
XINE_TV_CONFIRM_STOP
@@ -393,7 +395,7 @@
#
ROM_SPEED = 0
-CONFIRM_SHUTDOWN = 1 # ask before shutdown
+SHUTDOWN_CONFIRM = 1 # ask before shutdown
SHUTDOWN_SYS_CMD = 'shutdown -h now' # set this to 'sudo shutdown -h now' if
# you don't have the permissions to
shutdown
@@ -417,7 +419,7 @@
# -- autoshutdown menu item configuration --
-# CONFIRM_SHUTDOWN
+# SHUTDOWN_CONFIRM
# Set to True to popup dialog boxes for confirmation.
# this applies to menu items only.
AUTOSHUTDOWN_CONFIRM=True
@@ -1798,7 +1800,7 @@
}
#
-# FREQUENCY_TABLE - This is only used when Freevo changes the channel natively.
+# TV_FREQUENCY_TABLE - This is only used when Freevo changes the channel
natively.
# This is only the case if you are using V4L2 and any of the following plugins:
# timeshift, ivtv_record, ivtv_basic_tv.
# For the standard frequancy tables see src/tv/freq.py. To add your own just
@@ -1808,7 +1810,7 @@
# frequency table and you can also have entries here that are not present in
# there.
-FREQUENCY_TABLE = {
+TV_FREQUENCY_TABLE = {
'tuner_id' : 55250,
}
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 Wed Oct 17 16:44:37 2007
@@ -105,6 +105,8 @@
'MAJOR_AUDIO_CTRL': 'MIXER_MAJOR_CTRL',
'MAJOR_AUDIO_CTRL_MUTE': 'MIXER_MAJOR_MUTE_CTRL',
'ENABLE_SHUTDOWN_SYS': 'SHUTDOWN_SYS_ENABLE',
+ 'FREQUENCY_TABLE': 'TV_FREQUENCY_TABLE',
+ 'CONFIRM_SHUTDOWN': 'SHUTDOWN_CONFIRM',
}
def help():
Modified: branches/rel-1/freevo/src/helpers/makestationlist.py
==============================================================================
--- branches/rel-1/freevo/src/helpers/makestationlist.py (original)
+++ branches/rel-1/freevo/src/helpers/makestationlist.py Wed Oct 17
16:44:37 2007
@@ -88,8 +88,8 @@
c = 0
for m in config.TV_CHANNELS:
- if config.FREQUENCY_TABLE.has_key(m[2]):
- channelfreq = float(config.FREQUENCY_TABLE[m[2]]) / 1000.0
+ if config.TV_FREQUENCY_TABLE.has_key(m[2]):
+ channelfreq = float(config.TV_FREQUENCY_TABLE[m[2]]) / 1000.0
fp.write(' <station name="%s" active="1" position="%s"
band="Custom" channel="%sMHz"/>\n' % \
(cgi.escape(m[1]), c, channelfreq))
else:
Modified: branches/rel-1/freevo/src/plugins/shutdown.py
==============================================================================
--- branches/rel-1/freevo/src/plugins/shutdown.py (original)
+++ branches/rel-1/freevo/src/plugins/shutdown.py Wed Oct 17 16:44:37 2007
@@ -131,7 +131,7 @@
"""
return a list of actions for this item
"""
- if config.CONFIRM_SHUTDOWN:
+ if config.SHUTDOWN_CONFIRM:
items = [ (self.confirm_freevo, _('Shutdown Freevo') ),
(self.confirm_system, _('Shutdown system') ),
(self.confirm_system_restart, _('Restart system') ) ]
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 Wed Oct 17 16:44:37 2007
@@ -155,7 +155,7 @@
chan = str(chan)
vg = self.getVideoGroup(chan, isplayer)
- freq = config.FREQUENCY_TABLE.get(chan)
+ freq = config.TV_FREQUENCY_TABLE.get(chan)
if freq:
_debug_('Using custom frequency: chan="%s", freq="%s"' % (chan,
freq))
else:
Modified: branches/rel-1/freevo/src/tv/plugins/tvtime.py
==============================================================================
--- branches/rel-1/freevo/src/tv/plugins/tvtime.py (original)
+++ branches/rel-1/freevo/src/tv/plugins/tvtime.py Wed Oct 17 16:44:37 2007
@@ -239,7 +239,7 @@
mychan = m[2]
myband = self.lookupChannelBand(mychan)
if myband == "Custom":
- mychan = config.FREQUENCY_TABLE.get(mychan)
+ mychan = config.TV_FREQUENCY_TABLE.get(mychan)
mychan = float(mychan)
mychan = mychan / 1000.0
mychan = "%.2fMHz" % mychan
@@ -294,7 +294,7 @@
mychan = str(m[2])
myband = self.lookupChannelBand(mychan)
if myband == "Custom":
- mychan = config.FREQUENCY_TABLE.get(mychan)
+ mychan = config.TV_FREQUENCY_TABLE.get(mychan)
mychan = float(mychan)
mychan = mychan / 1000.0
mychan = "%.2fMHz" % mychan
@@ -319,7 +319,7 @@
#forces them to int.
channel = str(channel)
- if config.FREQUENCY_TABLE.has_key(channel):
+ if config.TV_FREQUENCY_TABLE.has_key(channel):
_debug_("have a custom")
return "Custom"
elif (re.search('^\d+$', channel)):
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 Wed Oct 17
16:44:37 2007
@@ -71,7 +71,7 @@
('C1.sfdrs.ch', 'SF 1', 'K05', '', '0', '777'),
('C2.sfdrs.ch', 'SF 2', 'K10', '', '0', '777'),
]
-FREQUENCY_TABLE = {
+TV_FREQUENCY_TABLE = {
'K32' : 559250,
'S13' : 246250,
'K05' : 175500,
Modified: branches/rel-1/freevo/src/tv/v4l2.py
==============================================================================
--- branches/rel-1/freevo/src/tv/v4l2.py (original)
+++ branches/rel-1/freevo/src/tv/v4l2.py Wed Oct 17 16:44:37 2007
@@ -255,7 +255,7 @@
def setchannel(self, channel):
- freq = config.FREQUENCY_TABLE.get(channel)
+ freq = config.TV_FREQUENCY_TABLE.get(channel)
if freq:
_debug_('Using custom frequency: chan="%s", freq="%s"' % (channel,
freq))
else:
Modified: branches/rel-1/freevo/src/www/htdocs/pluginconfig.rpy
==============================================================================
--- branches/rel-1/freevo/src/www/htdocs/pluginconfig.rpy (original)
+++ branches/rel-1/freevo/src/www/htdocs/pluginconfig.rpy Wed Oct 17
16:44:37 2007
@@ -36,7 +36,7 @@
import util
from plugin import is_active
from helpers.plugins import parse_plugins
-from helpers.plugins import info_html
+from helpers.plugins import html_info
import os
TRUE = 1
-------------------------------------------------------------------------
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
