Update of /cvsroot/freevo/freevo
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17182
Modified Files:
freevo_config.py local_conf.py.example
Log Message:
doc update
Index: local_conf.py.example
===================================================================
RCS file: /cvsroot/freevo/freevo/local_conf.py.example,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** local_conf.py.example 18 Mar 2004 15:38:18 -0000 1.29
--- local_conf.py.example 11 Apr 2004 17:06:21 -0000 1.30
***************
*** 44,48 ****
# AUDIO_INPUT_DEVICE = '/dev/dsp1' # e.g.: /dev/dsp0, /dev/audio, /dev/alsa/?
# MAJOR_AUDIO_CTRL = 'VOL' # Freevo takes control over one audio ctrl
! # 'VOL', 'PCM' 'OGAIN' etc.
# CONTROL_ALL_AUDIO = 1 # Should Freevo take complete control of
audio
# MAX_VOLUME = 90 # Set what you want maximum volume level to
be.
--- 44,48 ----
# AUDIO_INPUT_DEVICE = '/dev/dsp1' # e.g.: /dev/dsp0, /dev/audio, /dev/alsa/?
# MAJOR_AUDIO_CTRL = 'VOL' # Freevo takes control over one audio ctrl
! # 'VOL', 'PCM' 'OGAIN' etc.
# CONTROL_ALL_AUDIO = 1 # Should Freevo take complete control of
audio
[...1059 lines suppressed...]
+ #
+ # Precision for TV guide (in minutes)
+ #
+ # WWW_GUIDE_PRECISION = 5 #
+
+ #
# Show this many blocks at once
+ #
# WWW_GUIDE_COLS = 6
***************
*** 921,927 ****
-
-
-
# ======================================================================
# Internal stuff, you shouldn't change anything here unless you know
--- 992,995 ----
Index: freevo_config.py
===================================================================
RCS file: /cvsroot/freevo/freevo/freevo_config.py,v
retrieving revision 1.330
retrieving revision 1.331
diff -C2 -d -r1.330 -r1.331
*** freevo_config.py 22 Mar 2004 11:04:50 -0000 1.330
--- freevo_config.py 11 Apr 2004 17:06:20 -0000 1.331
***************
*** 259,271 ****
# Set to None to autodetect drives in during startup from /etc/fstab,
# set to [] to disable rom drive support at all
ROM_DRIVES = None
# hide discs from the wrong menu (e.g. VCDs in audio menu) and empty discs
HIDE_UNUSABLE_DISCS = 1
! ROM_SPEED = 0 # try to set the drive speed of the rom
! # drive a good value for playing movies
! # with a silent drive is 8
!
SHUTDOWN_SYS_CMD = 'shutdown -h now' # set this to 'sudo shutdown -h now' if
--- 259,275 ----
# Set to None to autodetect drives in during startup from /etc/fstab,
# set to [] to disable rom drive support at all
+ #
ROM_DRIVES = None
+ #
# hide discs from the wrong menu (e.g. VCDs in audio menu) and empty discs
+ #
HIDE_UNUSABLE_DISCS = 1
! #
! # Attempt to set the speed of the ROM drive. A good value for keeping the
! # drive silent while playing movies is 8.
! #
! ROM_SPEED = 0
SHUTDOWN_SYS_CMD = 'shutdown -h now' # set this to 'sudo shutdown -h now' if
***************
*** 279,288 ****
#
! # see src/event.py for a list of all possible events. You can add more keybindings
! # by adding them to the correct hash. E.g. pressing 1 should send 'contrast -100'
! # to mplayer, just write the folling line to your local_conf.py
#
# EVENTS['video']['1'] = Event(VIDEO_SEND_MPLAYER_CMD, arg='contrast -100')
#
EVENTS = {
'menu' : MENU_EVENTS,
--- 283,293 ----
#
! # You can add more keybindings by adding them to the correct hash.
! # e.g. If you want to send 'contrast -100' to mplayer by pressing the '1' key,
! # just add the following line:
#
# EVENTS['video']['1'] = Event(VIDEO_SEND_MPLAYER_CMD, arg='contrast -100')
#
+ # See src/event.py for a list of all possible events.
EVENTS = {
'menu' : MENU_EVENTS,
***************
*** 300,309 ****
#
! # use arrow keys for back and select (alternative way of navigating)
#
MENU_ARROW_NAVIGATION = 0
#
! # keymap to map keyboard keys to event strings. You can also add new keys
# here, e.g. KEYMAP[K_x] = 'SUBTITLE'. The K_-names are defined by pygame.
#
--- 305,314 ----
#
! # Use arrow keys for back and select (alternate way of navigating)
#
MENU_ARROW_NAVIGATION = 0
#
! # Keymap to map keyboard keys to event strings. You can also add new keys
# here, e.g. KEYMAP[K_x] = 'SUBTITLE'. The K_-names are defined by pygame.
#
***************
*** 311,317 ****
#
! # use resources for the internet to get more informations, like CDDB,
! # IMDB and Amazon cover search. Set this variable to 0 if your computer
! # has no network and stop Freevo from trying to use it.
#
USE_NETWORK = 1
--- 316,323 ----
#
! # Use Internet resources to fetch information?
! # For example, Freevo can use CDDB for album information,
! # the IMDB movie database for movie info, and Amazon for cover searches.
! # Set this to 0 if your computer isn't connected to a network.
#
USE_NETWORK = 1
***************
*** 329,337 ****
#
! # directory structure to save files when the normal filesystem
! # doesn't allow saving. This directory can handle covers and fxd files
! # for read only filesystems like a rom drive. Set this variable to your
# old MOVIE_DATA_DIR if you have one. It needs to be set to a directory
! # freevo can write to.
#
if os.environ.has_key('HOME') and os.environ['HOME']:
--- 335,343 ----
#
! # Directory location to save files when the normal filesystem
! # doesn't allow saving. This directory can save covers and fxd files
! # for read only filesystems like ROM drives. Set this variable to your
# old MOVIE_DATA_DIR if you have one. It needs to be set to a directory
! # Freevo can write to.
#
if os.environ.has_key('HOME') and os.environ['HOME']:
***************
*** 341,365 ****
#
! # umask for all files
# 022 means only the user has write access. If you share your Freevo
! # installation with different users, set it to 002
#
UMASK = 022
#
! # suffix for playlist files
#
PLAYLIST_SUFFIX = [ 'm3u' ]
#
! # use md5 in mmpython to create unique disc ids. Use this if you have
! # problems with different discs having the same id
#
MMPYTHON_CREATE_MD5_ID = 0
#
! # keep metadata in memory
# Setting this variable will keep all cache files in memory. Startup will be
! # slower, but for large directories, this will speed up entering the dir.
# 0 = Only keep current dir in memory. Use this if you have too much data
# and not enough RAM
--- 347,371 ----
#
! # Umask setting for all files.
# 022 means only the user has write access. If you share your Freevo
! # installation with different users, set this to 002
#
UMASK = 022
#
! # Suffix for playlist files
#
PLAYLIST_SUFFIX = [ 'm3u' ]
#
! # Use md5 in mmpython to create unique disc ids. Enable this if you have
! # problems with different discs having the same id.
#
MMPYTHON_CREATE_MD5_ID = 0
#
! # Keep metadata in memory
# Setting this variable will keep all cache files in memory. Startup will be
! # slower, but for large directories, this will speed up the display.
# 0 = Only keep current dir in memory. Use this if you have too much data
# and not enough RAM
***************
*** 376,382 ****
# ======================================================================
! # you can remove all plugins later in your local_conf.py by setting
! # plugin.remove(code). You can also use the name to remove a plugin. But
! # if you do that, all instances of this plugin will be removed.
#
# Examples:
--- 382,388 ----
# ======================================================================
! # Remove undesired plugins by setting plugin.remove(code).
! # You can also use the name to remove a plugin. But if you do that,
! # all instances of this plugin will be removed.
#
# Examples:
***************
*** 469,475 ****
plugin_record = plugin.activate('tv.generic_record')
! # Use this ivtv_record instead if you have an ivtv based card (PVR-250/350)
! # and want freevo to do everthing for you. TV_SETTINGS must be set
! # correctly. To use you need the following two lines in local_conf.py:
# plugin.remove('tv.generic_record')
# plugin_record = plugin.activate('tv.ivtv_record')
--- 475,483 ----
plugin_record = plugin.activate('tv.generic_record')
! #
! # Use ivtv_record instead if you have an ivtv based card (PVR-250/350)
! # and want freevo to do everthing for you. TV_SETTINGS must be set
! # correctly. To use you need to set the following two lines:
! #
# plugin.remove('tv.generic_record')
# plugin_record = plugin.activate('tv.ivtv_record')
***************
*** 484,488 ****
plugin.activate('tv.manual_record')
! # For joystick support:
# plugin.activate('joy')
--- 492,497 ----
plugin.activate('tv.manual_record')
! #
! # Enable this for joystick support:
# plugin.activate('joy')
***************
*** 507,533 ****
#
! # Should directories sorted by date instead of filename
! # 0 = no, 1 = yes, 2 = no for normal menus, yes for TV_RECORD_DIR
#
DIRECTORY_SORT_BY_DATE = 2
#
! # Show the items in the list in reverse order
#
DIRECTORY_REVERSE_SORT = 0
#
! # Should we use "smart" sorting to ignore 'The' in directories
! # 0 = no, 1 = yes
#
DIRECTORY_SMART_SORT = 0
#
! # Should freevo autoplay the item if only one item is in the directory
#
DIRECTORY_AUTOPLAY_SINGLE_ITEM = 1
#
! # Force the skin to a specific layout number. -1 == no force. The layout
# toggle with DISPLAY will be disabled
#
--- 516,545 ----
#
! # Should directories sorted by date instead of filename?
! # 0 = No, always sort by filename.
! # 1 = Yes, sort by date
! # 2 = No, don't sory by date for normal directories,
! # but sort by date for TV_RECORD_DIR.
#
DIRECTORY_SORT_BY_DATE = 2
#
! # Should directory items be sorted in reverse order?
#
DIRECTORY_REVERSE_SORT = 0
#
! # Should we use "smart" sorting?
! # Smart sorting ignores the word "The" in item names.
#
DIRECTORY_SMART_SORT = 0
#
! # Should Freevo autoplay an item if only one item is in the directory?
#
DIRECTORY_AUTOPLAY_SINGLE_ITEM = 1
#
! # Force the skin to use a specific layout number. -1 == no force. The layout
# toggle with DISPLAY will be disabled
#
***************
*** 535,544 ****
#
! # Formatstring for the audio item names, possible strings:
# a = artist, n = tracknumber, t = title, y = year, f = filename
#
! # This will show the title and the track number
# DIRECTORY_AUDIO_FORMAT_STRING = '%(n)s - %(t)s'
- # This is the default - track name only
#
DIRECTORY_AUDIO_FORMAT_STRING = '%(t)s'
--- 547,558 ----
#
! # Format string for the audio item names.
! #
! # Possible strings:
# a = artist, n = tracknumber, t = title, y = year, f = filename
#
! # Example:
! # This will show the title and the track number:
# DIRECTORY_AUDIO_FORMAT_STRING = '%(n)s - %(t)s'
#
DIRECTORY_AUDIO_FORMAT_STRING = '%(t)s'
***************
*** 546,562 ****
#
# Use media id tags to generate the name of the item. This should be
! # 1 all the time and only be disabled in directories with broken tags
#
DIRECTORY_USE_MEDIAID_TAG_NAMES = 1
#
! # The next varibales are a list of types in which the feature should be
! # enabled (video, audio, image, games). E.g. to enable autoplay for
! # audio and images set DIRECTORY_AUTOPLAY_ITEMS = [ 'audio', 'image' ],
! # to disable it set it to [].
#
# If you set this variable in a folder.fxd, the value is 1 (enabled)
# or 0 (disabled).
! #
#
--- 560,580 ----
#
# Use media id tags to generate the name of the item. This should be
! # enabled all the time. It should only be disabled for directories with
! # broken tags.
#
DIRECTORY_USE_MEDIAID_TAG_NAMES = 1
#
! # The following settings determine which features are available for
! # which media types.
#
# If you set this variable in a folder.fxd, the value is 1 (enabled)
# or 0 (disabled).
! #
! # Examples:
! # To enable autoplay for audio and image files:
! # DIRECTORY_AUTOPLAY_ITEMS = [ 'audio', 'image' ]
! # To disable autoplay entirely:
! # DIRECTORY_AUTOPLAY_ITEMS = []
#
***************
*** 572,576 ****
#
! # Add an item 'Random Playlist' to the directory
#
DIRECTORY_ADD_RANDOM_PLAYLIST = [ 'audio' ]
--- 590,594 ----
#
! # Add the item 'Random Playlist' to the directory
#
DIRECTORY_ADD_RANDOM_PLAYLIST = [ 'audio' ]
***************
*** 589,593 ****
#
# Where the movie files can be found.
! # This is a list of items (e.g. directories, fxd files). The items itself
# can also be a list of (title, file)
#
--- 607,611 ----
#
# Where the movie files can be found.
! # This is a list of items (e.g. directories, fxd files). The items themselves
# can also be a list of (title, file)
#
***************
*** 595,599 ****
# ('funny stuff', '/files/movies/comedy') ]
#
! # Some people have movies on different maschines using an automounter.
# To avoid timeouts, you can specify the machine name in the directory
# to check if the machine is alive first
--- 613,617 ----
# ('funny stuff', '/files/movies/comedy') ]
#
! # Some people access movies on a different machine using an automounter.
# To avoid timeouts, you can specify the machine name in the directory
# to check if the machine is alive first
***************
*** 627,631 ****
#
! # Prefered video player
#
VIDEO_PREFERED_PLAYER = 'mplayer'
--- 645,649 ----
#
! # Preferred video player
#
VIDEO_PREFERED_PLAYER = 'mplayer'
***************
*** 633,637 ****
#
# Only scan OVERLAY_DIR and VIDEO_SHOW_DATA_DIR for fxd files containing
! # informations about a disc. If you only have the fxd files for discs in
# one of this directories (and subdirectories), set this to 1, it will
# speed up startup, 0 may be needed if you have fxd files with disc links
--- 651,655 ----
#
# Only scan OVERLAY_DIR and VIDEO_SHOW_DATA_DIR for fxd files containing
! # information about a disc. If you only have the fxd files for discs in
# one of this directories (and subdirectories), set this to 1, it will
# speed up startup, 0 may be needed if you have fxd files with disc links
***************
*** 661,677 ****
#
! # This regexp should recognize filenames which are likely to be covers
! # for an album. This example will match front.jpg and cover-f.jpg, but
! # not back.jpg nor cover-b.jpg
#
AUDIO_COVER_REGEXP = 'front|-f'
#
! # Prefered audio player
#
AUDIO_PREFERED_PLAYER = 'mplayer'
#
! # Also show video files in the audio menu (for musicvideos)
#
AUDIO_SHOW_VIDEOFILES = False
--- 679,696 ----
#
! # Regular expression used to recognize filenames which are likely to be
! # covers for an album
! #
! # This will match front.jpg and cover-f.jpg, but not back.jpg nor cover-b.jpg
#
AUDIO_COVER_REGEXP = 'front|-f'
#
! # Preferred audio player
#
AUDIO_PREFERED_PLAYER = 'mplayer'
#
! # Show video files in the audio menu (for music-videos)
#
AUDIO_SHOW_VIDEOFILES = False
***************
*** 682,686 ****
#
! # Where the image files can be found.
# This is a list of items (e.g. directories, fxd files). The items itself
# can also be a list of (title, file)
--- 701,705 ----
#
! # Where image files can be found.
# This is a list of items (e.g. directories, fxd files). The items itself
# can also be a list of (title, file)
***************
*** 701,712 ****
! # The number of blend steps between images, 0 to disable blending
IMAGEVIEWER_BLEND_STEPS = 10
# Total time in seconds for blending from one image to the next
IMAGEVIEWER_BLEND_TIME = 0.75
# use exif thumbnail your thumbnail review. The quality is lower but
# it's much faster
IMAGE_USE_EXIF_THUMBNAIL = 1
--- 720,738 ----
! #
! # The number of blend steps between images
! # 0 = Disable blending
! #
IMAGEVIEWER_BLEND_STEPS = 10
+ #
# Total time in seconds for blending from one image to the next
+ #
IMAGEVIEWER_BLEND_TIME = 0.75
+ #
# use exif thumbnail your thumbnail review. The quality is lower but
# it's much faster
+ #
IMAGE_USE_EXIF_THUMBNAIL = 1
***************
*** 722,726 ****
# is at http://x.mame.net since the regular MAME is for Windows.
#
! # SNES stands for Super Nintendo Entertainment System. Freevo relies
# on other programs that are not included in Freevo to play these games.
#
--- 748,752 ----
# is at http://x.mame.net since the regular MAME is for Windows.
#
! # SNES stands for Super Nintendo Entertainment System. Freevo relies
# on other programs that are not included in Freevo to play these games.
#
***************
*** 751,764 ****
GAMES_ITEMS = None
- # are used for the Mame arcade emulator.
#
! GAMES_NICE = -20 # Priority of the game process. 0 is unchanged,
! # <0 is higher prio, >0 lower prio.
! # prio <0 has no effect unless run as root.
GAMES_MAME_CACHE = '%s/romlist-%s.pickled' % (FREEVO_CACHEDIR, os.getuid())
# ======================================================================
! # freevo SKIN section:
# ======================================================================
--- 777,798 ----
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 SKIN settings:
# ======================================================================
***************
*** 778,792 ****
#
# Select a way when to switch to text view even if a image menu is there
! # Possible values are
! # 1. force text view when all items have the same image and there are no
! # directories
! # 2. Ignore the directories, always switch to text view when all images
! # are the same
#
SKIN_FORCE_TEXTVIEW_STYLE = 1
#
! # Force text view for the mediamenu (first menu for video, audio, images and
! # games).
#
SKIN_MEDIAMENU_FORCE_TEXTVIEW = 0
--- 812,827 ----
#
# Select a way when to switch to text view even if a image menu is there
! #
! # 1 = Force text view when all items have the same image and there are no
! # directories
! # 2 = Ignore the directories, always switch to text view when all images
! # are the same
#
SKIN_FORCE_TEXTVIEW_STYLE = 1
#
! # Force text view for the media menu
! # (The media menu is the first menu displayed for video, audio, images
! # and games).
#
SKIN_MEDIAMENU_FORCE_TEXTVIEW = 0
***************
*** 795,799 ****
# ======================================================================
! # freevo OSD section:
# ======================================================================
--- 830,834 ----
# ======================================================================
! # Freevo OSD settings:
# ======================================================================
***************
*** 805,823 ****
#
! # Sytem Path were to search for fonts not in the Freevo distribution
#
OSD_EXTRA_FONT_PATH = [ '/usr/X11R6/lib/X11/fonts/truetype/' ]
! # Font aliases, all names must be lowercase!
! # All alternate fonts must be in './share/fonts/'
OSD_FONT_ALIASES = { 'arial_bold.ttf' : 'VeraBd.ttf' }
# (seconds, files)
! # number seconds until the busy icon is shown in the menu.
! # or show it right away when we know it takes some time (more than files number
! # of files in a directory. Set this to None to disable this
OSD_BUSYICON_TIMER = (0.7, 200)
OSD_SDL_EXEC_AFTER_STARTUP = ""
OSD_OVERSCAN_X = 0
OSD_OVERSCAN_Y = 0
--- 840,873 ----
#
! # System Path to search for fonts not included in the Freevo distribution
#
OSD_EXTRA_FONT_PATH = [ '/usr/X11R6/lib/X11/fonts/truetype/' ]
! #
! # Font aliases
! # All names must be lowercase! All alternate fonts must be in './share/fonts/'
! #
OSD_FONT_ALIASES = { 'arial_bold.ttf' : 'VeraBd.ttf' }
+ #
+ # Number of seconds to wait until the busy icon is shown in the menu.
+ # Busy icon can also be shown right away when there is more than a certain
+ # number of files in a directory.
+ #
+ # Set this to None to disable this.
# (seconds, files)
! #
OSD_BUSYICON_TIMER = (0.7, 200)
+ #
+ # Execute a script on OSD startup.
+ #
OSD_SDL_EXEC_AFTER_STARTUP = ""
+
+ #
+ # Execute a script on OSD close.
+ #
+ OSD_SDL_EXEC_AFTER_CLOSE = ""
+
OSD_OVERSCAN_X = 0
OSD_OVERSCAN_Y = 0
***************
*** 830,833 ****
--- 880,884 ----
OSD_SDL_EXEC_AFTER_STARTUP='%s %s %s' % (os.path.join(CONTRIB_DIR,
'fbcon/mgafb'),
CONF.tv, CONF.geometry)
+ OSD_SDL_EXEC_AFTER_CLOSE='%s restore' % os.path.join(CONTRIB_DIR, 'fbcon/mgafb')
OSD_OVERSCAN_X = 20
OSD_OVERSCAN_Y = 10
***************
*** 841,852 ****
OSD_OVERSCAN_Y = 45
! # Exec a script on the osd close.
! OSD_SDL_EXEC_AFTER_CLOSE = ""
!
! if CONF.display == 'mga':
! OSD_SDL_EXEC_AFTER_CLOSE='%s restore' % os.path.join(CONTRIB_DIR, 'fbcon/mgafb')
!
# Stop the osd before playing a movie with xine or mplayer. Some output
# devices need this. After playback, the osd will be restored
OSD_STOP_WHEN_PLAYING = 0
--- 892,899 ----
OSD_OVERSCAN_Y = 45
! #
# Stop the osd before playing a movie with xine or mplayer. Some output
# devices need this. After playback, the osd will be restored
+ #
OSD_STOP_WHEN_PLAYING = 0
***************
*** 854,861 ****
--- 901,912 ----
OSD_STOP_WHEN_PLAYING = 1
+ #
# Dim text that doesn't fit instead of using ellipses.
+ #
OSD_DIM_TEXT = 1
+ #
# Make a complete screen redraw every time. This is necessary sometimes
+ #
OSD_UPDATE_COMPLETE_REDRAW = 0
***************
*** 864,873 ****
# ======================================================================
! # Remote control section
# ======================================================================
#
! # you need a lircrc file, like this:
#
# begin
--- 915,926 ----
# ======================================================================
! # Freevo remote control settings:
# ======================================================================
#
! # Location of the lircrc file
! #
! # For remote control support, Freevo needs a lircrc file, like this:
#
# begin
***************
*** 904,930 ****
# ======================================================================
! # tvtime section:
# ======================================================================
TVTIME_CMD = CONF.tvtime
# ======================================================================
! # MPlayer section:
# ======================================================================
MPLAYER_CMD = CONF.mplayer
! MPLAYER_AO_DEV = 'oss:/dev/dsp' # e.g.: oss,sdl,alsa, see mplayer docs
if CONF.display == 'x11':
! MPLAYER_VO_DEV = 'xv,sdl,x11,' # X11 drivers in order of preference
else:
! MPLAYER_VO_DEV = CONF.display # e.g.: x11,mga,fbdev, see mplayer docs
! MPLAYER_VO_DEV_OPTS = '' # e.g.: ':some_var=vcal'
! DVD_LANG_PREF = 'en,se,no' # Order of preferred languages on DVD.
! DVD_SUBTITLE_PREF = '' # Order of preferred subtitles on DVD.
# Priority of mplayer process. 0 is unchanged, <0 is higher prio, >0 lower prio.
--- 957,987 ----
# ======================================================================
! # TVtime settings:
# ======================================================================
+ #
+ # Location of the TV time program
+ # Default: Use the value in freevo.conf
+ #
TVTIME_CMD = CONF.tvtime
# ======================================================================
! # MPlayer settings:
# ======================================================================
MPLAYER_CMD = CONF.mplayer
! MPLAYER_AO_DEV = 'oss:/dev/dsp' # e.g.: oss,sdl,alsa, see mplayer docs
if CONF.display == 'x11':
! MPLAYER_VO_DEV = 'xv,sdl,x11,' # X11 drivers in order of preference
else:
! MPLAYER_VO_DEV = CONF.display # e.g.: x11,mga,fbdev, see mplayer docs
! MPLAYER_VO_DEV_OPTS = '' # e.g.: ':some_var=vcal'
! DVD_LANG_PREF = 'en,se,no' # Order of preferred languages on DVD.
! DVD_SUBTITLE_PREF = '' # Order of preferred subtitles on DVD.
# Priority of mplayer process. 0 is unchanged, <0 is higher prio, >0 lower prio.
***************
*** 945,949 ****
# with the mplayer option '-nosws'. If you have -framedrop or -hardframedrop
# as mplayer option, the software scaler will also not be used.
! # A good value for this variable is
# MPLAYER_SOFTWARE_SCALER = "-subfont-text-scale 5 -fs -sws 2 -vf scale=%s:-3,"\
# "expand=%s:%s " % ( CONF.width, CONF.width, CONF.height )
--- 1002,1006 ----
# with the mplayer option '-nosws'. If you have -framedrop or -hardframedrop
# as mplayer option, the software scaler will also not be used.
! # A good value for this variable is:
# MPLAYER_SOFTWARE_SCALER = "-subfont-text-scale 5 -fs -sws 2 -vf scale=%s:-3,"\
# "expand=%s:%s " % ( CONF.width, CONF.width, CONF.height )
***************
*** 954,959 ****
#
! # Mplayer args for the different kinds of files. Possible values are dvd, vcd,
! # cd (audio cd), tv, all extentions and default if nothing matches
#
MPLAYER_ARGS = { 'dvd' : '-cache 8192',
--- 1011,1016 ----
#
! # Mplayer arguments for different media formats. (eg DVDs, CDs, AVI files, etc)
! # Uses a default value if nothing else matches.
#
MPLAYER_ARGS = { 'dvd' : '-cache 8192',
***************
*** 969,980 ****
}
# Number of seconds before seek value times out. This is used when
! # seeking to a specified number of minutes into a movie. If you make
# a mistake or change your mind, the seek value will timeout after
! # this many seconds
#
MPLAYER_SEEK_TIMEOUT = 8
! # Autocrop files when playing. This is usefull for files in 4:3 with black
# bars on a 16:9 tv
#
--- 1026,1039 ----
}
+ #
# Number of seconds before seek value times out. This is used when
! # seeking a specified number of minutes into a movie. If you make
# a mistake or change your mind, the seek value will timeout after
! # this many seconds.
#
MPLAYER_SEEK_TIMEOUT = 8
! #
! # Autocrop files when playing. This is useful for files in 4:3 with black
# bars on a 16:9 tv
#
***************
*** 983,990 ****
#
# Try to set correct 'delay' and 'mc' values for mplayer based on the delay
! # from mmpython. This should correct av sync problems with mplayer for some
! # files, but may also break things (I don't know, that's why it's disabled
! # as default). WARNING: when seeking, the playback is out of sync for some
! # seconds! This only works with mmpython > 0.2
#
MPLAYER_SET_AUDIO_DELAY = 0
--- 1042,1050 ----
#
# Try to set correct 'delay' and 'mc' values for mplayer based on the delay
! # from mmpython.
! #
! # This should correct av sync problems with mplayer for some files, but
! # may also break things. (I don't know, that's why it's disabled by default).
! # WARNING: When seeking, the playback is out of sync for some seconds!
#
MPLAYER_SET_AUDIO_DELAY = 0
***************
*** 992,996 ****
# ======================================================================
! # Xine section:
# ======================================================================
--- 1052,1056 ----
# ======================================================================
! # Xine settings:
# ======================================================================
***************
*** 1022,1026 ****
# ======================================================================
! # TV:
# ======================================================================
--- 1082,1086 ----
# ======================================================================
! # Freevo TV settings:
# ======================================================================
***************
*** 1066,1072 ****
TV_SETTINGS = '%s television %s %s' % (CONF.tv, CONF.chanlist, TV_DEVICE)
! # This is the 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.
TIMESHIFT_BUFFER_SIZE = 128
--- 1126,1134 ----
TV_SETTINGS = '%s television %s %s' % (CONF.tv, CONF.chanlist, TV_DEVICE)
! #
! # 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.
! #
TIMESHIFT_BUFFER_SIZE = 128
***************
*** 1299,1306 ****
# ======================================================================
! # Builtin WWW server settings
# ======================================================================
! # To activate the build in web server, please activate the www plugin
# in your local_conf.py:
#
--- 1361,1369 ----
# ======================================================================
! # Freevo builtin WWW server settings:
# ======================================================================
! #
! # To activate the built in web server, please activate the www plugin
# in your local_conf.py:
#
***************
*** 1310,1314 ****
# Web server port number. 80 is the standard port, but is often
# taken already by apache, and cannot be used unless the server
! # runs as root. Use port 8080 as the default, change to 80 if
# needed.
#
--- 1373,1377 ----
# Web server port number. 80 is the standard port, but is often
# taken already by apache, and cannot be used unless the server
! # runs as root. Port 8080 is the default, change to 80 if
# needed.
#
***************
*** 1324,1332 ****
WWW_USERS = { 0 : 0 }
! # The tv guide is divided into 30 minute intervals
WWW_GUIDE_INTERVAL = 30
- WWW_GUIDE_PRECISION = 5 # 5 minutes precision
# Show this many blocks at once
WWW_GUIDE_COLS = 6
--- 1387,1403 ----
WWW_USERS = { 0 : 0 }
! #
! # Divide the TV guide into intervals of this length (in minutes)
! #
WWW_GUIDE_INTERVAL = 30
+ #
+ # Precision for TV guide (in minutes)
+ #
+ WWW_GUIDE_PRECISION = 5
+
+ #
# Show this many blocks at once
+ #
WWW_GUIDE_COLS = 6
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
