Author: dmeyer
Date: Thu Oct 27 18:03:31 2005
New Revision: 7769
Modified:
trunk/ui/freevo_config.py
trunk/ui/src/gui/displays/sdl.py
trunk/ui/src/helpers/convert_config.py
Log:
clean up freevo_config.py
Modified: trunk/ui/freevo_config.py
==============================================================================
--- trunk/ui/freevo_config.py (original)
+++ trunk/ui/freevo_config.py Thu Oct 27 18:03:31 2005
@@ -761,22 +761,6 @@
GAMES_ITEMS = None
-#
-# These settings are used for the MAME arcade emulator:
-#
-
-# Priority of the game process
-# 0 = Don't change the priority
-# >0 - Lower priority
-# <0 - Higher priority
-#
-GAMES_NICE = -20
-
-#
-# MAME cache directory
-#
-GAMES_MAME_CACHE = '%s/romlist-%s.pickled' % (FREEVO_CACHEDIR, os.getuid())
-
# ======================================================================
# Freevo GUI settings:
@@ -801,16 +785,6 @@
GUI_FONT_ALIASES = { 'Arial_Bold' : 'VeraBd' }
#
-# Execute a script on GUI startup.
-#
-GUI_SDL_EXEC_AFTER_STARTUP = ""
-
-#
-# Execute a script on GUI close.
-#
-GUI_SDL_EXEC_AFTER_CLOSE = ""
-
-#
# Overscan on the tv output. Set this values if you can't see everything
# from Freevo on the tv screen.
#
@@ -932,17 +906,6 @@
# ======================================================================
-# TVtime settings:
-# ======================================================================
-
-#
-# Location of the TV time program
-# Default: Use the value in freevo.conf
-#
-TVTIME_CMD = CONF.tvtime
-
-
-# ======================================================================
# MPlayer settings:
# ======================================================================
@@ -1088,11 +1051,6 @@
TV_RECORD_DIR = None
#
-# Autostart recorder when starting the recordserver
-#
-TV_RECORD_START_RECORDER = False
-
-#
# Size (in MB) of the timeshift buffer. (ie: how long you can pause tv for.)
# This is set to a low default because the default buffer location is
# under FREEVO_CACHEDIR and we don't want to blow /var or /tmp.
@@ -1102,62 +1060,6 @@
TV_DATETIMEFORMAT = '%A %b %d %I:%M %p' # Thursday September 24 8:54 am
#
-# This is the filename format for files recorded using Freevo.
-# You can use any of the strftime variables in it, provided you
-# put two '%%' at the beginning.
-#
-# Some examples:
-# %%A - Full weekday name.
-# %%H - Hour (24-hour clock) as a decimal number [00,23].
-# %%M - Minute as a decimal number [00,59].
-# %%m - Month as a decimal number [01,12].
-# %%d - Day of the month as a decimal number [01,31].
-# %%p - Locale's equivalent of either AM or PM.
-#
-# More can be found at: http://www.python.org/doc/current/lib/module-time.html
-#
-TV_RECORD_FILEMASK = '%%m-%%d %%H:%%M %(progname)s - %(title)s'
-
-#
-# If the recordserver runs as root, set the uid to the given one
-# after startup. The gui must also match one of the users group ids
-#
-TV_RECORD_SERVER_UID = 0
-TV_RECORD_SERVER_GID = 0
-
-#
-# start every recording X minutes before scheduled,
-# and stop X minutes after scheduled - default to zero minutes.
-# This must be a value in seconds although at the moment only has
-# the percision of one minute.
-#
-TV_RECORD_START_PADDING = 2 * 60
-TV_RECORD_STOP_PADDING = 5 * 60
-
-#
-# TV capture size for viewing and recording. Max 768x480 for NTSC,
-# 768x576 for PAL. Set lower if you have a slow computer!
-#
-# For the 'tvtime' TV viewing application, only the horizontal size is used.
-# Set the horizontal size to 400 or 480 if you have a slow (~500MHz) computer,
-# it still looks OK, and the picture will not be as jerky.
-# The vertical size is always either fullscreen or 480/576 (NTSC/PAL)
-# for tvtime.
-#
-TV_VIEW_SIZE = (640, 480)
-TV_REC_SIZE = (320, 240) # Default for slower computers
-
-#
-# Input formats for viewing and recording. The format affect viewing
-# and recording performance. It is specific to your hardware, so read
-# the MPlayer docs and experiment with mplayer to see which one fits
-# your computer best.
-#
-TV_VIEW_OUTFMT = 'yuy2' # Better quality, slower on pure FB/X11
-TV_REC_OUTFMT = 'yuy2'
-
-
-#
# TV Channels. This list contains a mapping from the displayed channel name
# to the actual channel name as used by the TV watching application.
# The display name must match the names from the XMLTV guide,
Modified: trunk/ui/src/gui/displays/sdl.py
==============================================================================
--- trunk/ui/src/gui/displays/sdl.py (original)
+++ trunk/ui/src/gui/displays/sdl.py Thu Oct 27 18:03:31 2005
@@ -55,8 +55,6 @@
PygameCanvas.__init__(self, size)
Base.__init__(self)
plugin.activate('input.sdl')
- if config.GUI_SDL_EXEC_AFTER_STARTUP:
- os.system(config.GUI_SDL_EXEC_AFTER_STARTUP)
def stop(self):
@@ -65,8 +63,6 @@
"""
if Base.stop(self):
pygame.display.quit()
- if config.GUI_SDL_EXEC_AFTER_CLOSE:
- os.system(config.GUI_SDL_EXEC_AFTER_CLOSE)
def restart(self):
Modified: trunk/ui/src/helpers/convert_config.py
==============================================================================
--- trunk/ui/src/helpers/convert_config.py (original)
+++ trunk/ui/src/helpers/convert_config.py Thu Oct 27 18:03:31 2005
@@ -3,40 +3,6 @@
import re
import util
-# change_map = {
-# 'DIR_MOVIES': 'VIDEO_ITEMS',
-# 'DIR_AUDIO' : 'AUDIO_ITEMS',
-# 'DIR_IMAGES': 'IMAGE_ITEMS',
-# 'DIR_GAMES' : 'GAMES_ITEMS',
-# 'DIR_RECORD': 'TV_RECORD_DIR',
-# 'SUFFIX_VIDEO_FILES': 'VIDEO_SUFFIX',
-# 'SUFFIX_VIDEO_MPLAYER_FILES': 'VIDEO_MPLAYER_SUFFIX',
-# 'SUFFIX_VIDEO_XINE_FILES': 'VIDEO_XINE_SUFFIX',
-# 'ONLY_SCAN_DATADIR': 'VIDEO_ONLY_SCAN_DATADIR',
-# 'SUFFIX_AUDIO_FILES': 'AUDIO_SUFFIX',
-# 'SUFFIX_AUDIO_PLAYLISTS': 'PLAYLIST_SUFFIX',
-# 'SUFFIX_IMAGE_FILES': 'IMAGE_SUFFIX',
-# 'SUFFIX_IMAGE_SSHOW': 'IMAGE_SSHOW_SUFFIX',
-# 'MAME_CACHE': 'GAMES_MAME_CACHE',
-# 'OSD_SKIN': 'SKIN_MODULE',
-# 'FORCE_SKIN_LAYOUT': 'DIRECTORY_FORCE_SKIN_LAYOUT',
-# 'AUDIO_FORMAT_STRING': 'DIRECTORY_AUDIO_FORMAT_STRING',
-# 'USE_MEDIAID_TAG_NAMES': 'DIRECTORY_USE_MEDIAID_TAG_NAMES',
-# 'OVERSCAN_X': 'OSD_OVERSCAN_X',
-# 'OVERSCAN_Y': 'OSD_OVERSCAN_Y',
-# 'TV_SHOW_DATA_DIR': 'VIDEO_SHOW_DATA_DIR',
-# 'TV_SHOW_REGEXP': 'VIDEO_SHOW_REGEXP',
-# 'TV_SHOW_REGEXP_MATCH': 'VIDEO_SHOW_REGEXP_MATCH',
-# 'TV_SHOW_REGEXP_SPLIT': 'VIDEO_SHOW_REGEXP_SPLIT',
-# 'STOP_OSD_WHEN_PLAYING': 'OSD_STOP_WHEN_PLAYING',
-# 'RECORD_SCHEDULE': 'TV_RECORD_SCHEDULE',
-# 'RECORD_SERVER_IP': 'TV_RECORD_SERVER_IP',
-# 'RECORD_SERVER_PORT': 'TV_RECORD_SERVER_PORT',
-# 'RECORD_PADDING': 'TV_RECORD_PADDING',
-# 'IVTV_OPTIONS': 'TV_IVTV_OPTIONS',
-# 'VCR_SETTINGS': 'TV_VCR_SETTINGS',
-# }
-
change_map = {
'SKIN_XML_FILE': 'GUI_XML_FILE',
'SKIN_DEFAULT_XML_FILE': 'GUI_DEFAULT_XML_FILE',
@@ -47,15 +13,12 @@
'OSD_EXTRA_FONT_PATH': 'GUI_FONT_PATH',
'OSD_FONT_ALIASES': 'GUI_FONT_ALIASES',
'OSD_BUSYICON_TIMER': 'GUI_BUSYICON_TIMER',
- 'OSD_SDL_EXEC_AFTER_STARTUP': 'GUI_SDL_EXEC_AFTER_STARTUP',
- 'OSD_SDL_EXEC_AFTER_CLOSE': 'GUI_SDL_EXEC_AFTER_CLOSE',
'OSD_OVERSCAN_X': 'GUI_OVERSCAN_X',
'OSD_OVERSCAN_Y': 'GUI_OVERSCAN_Y',
'OSD_STOP_WHEN_PLAYING': 'GUI_STOP_WHEN_PLAYING',
'OSD_DISPLAY': 'GUI_DISPLAY',
'OSD_BACKGROUND_VIDEO': 'GUI_BACKGROUND_VIDEO',
'OSD_FADE_STEPS': 'GUI_FADE_STEPS',
- 'TV_RECORDFILE_MASK': 'TV_RECORD_FILEMASK'
}
def help():
-------------------------------------------------------
This SF.Net email is sponsored by the JBoss Inc.
Get Certified Today * Register for a JBoss Training Course
Free Certification Exam for All Training Attendees Through End of 2005
Visit http://www.jboss.com/services/certification for more information
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
