Update of /cvsroot/freevo/freevo
In directory sc8-pr-cvs1:/tmp/cvs-serv32704
Modified Files:
freevo_config.py setup_freevo.py
Log Message:
xine support and cleanups.
o xine support and configuration in freevo_config.py
o cleanup in setup_freevo: use one variable to store all needed
programs
o config.py uses setup_freevo to search for missing programs at startup
Index: freevo_config.py
===================================================================
RCS file: /cvsroot/freevo/freevo/freevo_config.py,v
retrieving revision 1.216
retrieving revision 1.217
diff -C2 -d -r1.216 -r1.217
*** freevo_config.py 31 Jul 2003 02:18:22 -0000 1.216
--- freevo_config.py 1 Aug 2003 17:54:05 -0000 1.217
***************
*** 109,114 ****
# is different, there will be only a warning
! FREEVO_CONF_VERSION = 2.0
! LOCAL_CONF_VERSION = 3.4
# Description of changes in each new version
--- 109,113 ----
# is different, there will be only a warning
! LOCAL_CONF_VERSION = 3.5
# Description of changes in each new version
***************
*** 148,152 ****
'''Removed RC_MPLAYER_CMDS for video and audio. Set special handling (and
other key mappings with the variable EVENTS. See event.py for possible
! events''')]
--- 147,153 ----
'''Removed RC_MPLAYER_CMDS for video and audio. Set special handling (and
other key mappings with the variable EVENTS. See event.py for possible
! events'''),
! (3.5,
! '''Added xine support (see xine section in freevo_config.py''')]
***************
*** 154,157 ****
--- 155,160 ----
# steps
+ FREEVO_CONF_VERSION = setup_freevo.CONFIG_VERSION
+
if int(str(CONF.version).split('.')[0]) != \
int(str(FREEVO_CONF_VERSION).split('.')[0]):
***************
*** 725,728 ****
--- 728,756 ----
#
MPLAYER_SEEK_TIMEOUT = 8
+
+ # ======================================================================
+ # Xine section:
+ # ======================================================================
+
+ # You need xine-ui version greater 0.9.21 to use the xine plugin
+
+ if CONF.display == 'mga' and CONF.fbxine:
+ XINE_VO_DEV = 'vidixfb'
+ XINE_COMMAND = CONF.fbxine
+
+ if CONF.display == 'dxr3' and CONF.fbxine:
+ XINE_VO_DEV = 'dxr3'
+ XINE_COMMAND = CONF.fbxine
+
+ if CONF.display == 'x11' and CONF.xine:
+ XINE_VO_DEV = 'xv'
+ XINE_COMMAND = '%s -g --no-splash -B --geometry %sx%s+0+0' % \
+ (CONF.xine, CONF.width, CONF.height)
+
+ XINE_AO_DEV = 'oss' # alsa or oss
+ XINE_USE_VCDNAV = 0 # use xine for VCD nav playback
+
+ # plugin.activate('video.xine')
+
# ======================================================================
Index: setup_freevo.py
===================================================================
RCS file: /cvsroot/freevo/freevo/setup_freevo.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** setup_freevo.py 18 Jul 2003 16:51:03 -0000 1.11
--- setup_freevo.py 1 Aug 2003 17:54:05 -0000 1.12
***************
*** 13,16 ****
--- 13,23 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.12 2003/08/01 17:54:05 dischi
+ # xine support and cleanups.
+ # o xine support and configuration in freevo_config.py
+ # o cleanup in setup_freevo: use one variable to store all needed
+ # programs
+ # o config.py uses setup_freevo to search for missing programs at startup
+ #
# Revision 1.11 2003/07/18 16:51:03 rshortt
# Removing xv and dga from the valid display types. x11 should cover all
***************
*** 71,78 ****
import string
! CONFIG_VERSION = 2.0
# Help text
! usage = '''\
Usage: ./freevo setup [OPTION]...
Set up Freevo for your specific environment.
--- 78,100 ----
import string
! CONFIG_VERSION = 2.1
!
! EXTERNAL_PROGRAMS = (("mplayer", "mplayer", 1),
! ("tvtime", "tvtime", 0),
! ("xine", "xine", 0),
! ("fbxine", "fbxine", 0),
! ("jpegtran", "jpegtran", 0),
! ("xmame.x11", "xmame", 0),
! ("xmame.SDL", "xmame", 0),
! ("ssnes9x", "snes", 0),
! ("zsnes", "snes", 0 ),
! ("lame", "lame",0),
! ("cdparanoia","cdparanoia",0),
! ("oggenc","oggenc",0))
!
# Help text
! def print_usage():
! usage = '''\
Usage: ./freevo setup [OPTION]...
Set up Freevo for your specific environment.
***************
*** 104,108 ****
'''
- def print_usage():
print usage
--- 126,129 ----
***************
*** 123,127 ****
! def main():
# Default opts
--- 144,225 ----
! def check_config(conf):
! vals_geometry = ['800x600', '768x576', '640x480']
! vals_display = ['x11', 'fbdev', 'dfbmga', 'mga', 'dxr3', 'sdl']
! vals_tv = ['ntsc', 'pal', 'secam']
! vals_chanlist = ['us-bcast', 'us-cable', 'us-cable-hrc',
! 'japan-bcast', 'japan-cable', 'europe-west',
! 'europe-east', 'italy', 'newzealand', 'australia',
! 'ireland', 'france', 'china-bcast', 'southafrica',
! 'argentina', 'canada-cable']
!
! if not conf.geometry in vals_geometry:
! print 'geometry must be one of: %s' % ' '.join(vals_geometry)
! sys.exit(1)
!
! if not conf.display in vals_display:
! print 'display must be one of: %s' % ' '.join(vals_display)
! sys.exit(1)
!
! if not conf.tv in vals_tv:
! print 'tv must be one of: %s' % ' '.join(vals_tv)
! sys.exit(1)
!
! if not conf.chanlist in vals_chanlist:
! print 'chanlist must be one of: %s' % ' '.join(vals_chanlist)
! sys.exit(1)
!
!
! def create_config(conf):
!
! print 'Creating freevo.conf...',
!
! fd = open('freevo.conf', 'w')
! for val in dir(conf):
! if val[0:2] == '__': continue
!
! # Some Python magic to get all members of the struct
! fd.write('%s = %s\n' % (val, conf.__dict__[val]))
!
! print 'done'
!
!
! def check_program(conf, name, variable, necessary, sysfirst=1, verbose=1):
!
! # Check for programs both in the path and the runtime apps dir
! search_dirs_runtime = ['./runtime/apps', './runtime/apps/mplayer',
! './runtime/apps/tvtime']
! if sysfirst:
! search_dirs = os.environ['PATH'].split(':') + search_dirs_runtime
! else:
! search_dirs = search_dirs_runtime + os.environ['PATH'].split(':')
!
! if verbose:
! print 'checking for %-13s' % (name+'...'),
!
! for dirname in search_dirs:
! filename = os.path.join(dirname, name)
! if os.path.exists(filename) and os.path.isfile(filename):
! if verbose:
! print filename
! conf.__dict__[variable] = filename
! break
! else:
! if necessary:
! print
"********************************************************************"
! print "ERROR: can't find %s" % name
! print "Please install the application respectively put it in your path."
! print "Freevo won't work without it."
! print
"********************************************************************"
! print
! print
! sys.exit(1)
! elif verbose:
! print "not found (deactivated)"
!
!
!
!
! if __name__ == '__main__':
# Default opts
***************
*** 182,196 ****
print 'System path first=%s' % ( ['NO','YES'][sysfirst])
!
! check_program(conf, "mplayer", "mplayer", 1, sysfirst)
! check_program(conf, "tvtime", "tvtime", 0, sysfirst)
! check_program(conf, "jpegtran", "jpegtran", 0, sysfirst)
! check_program(conf, "xmame.x11", "xmame", 0, sysfirst)
! check_program(conf, "xmame.SDL", "xmame", 0, sysfirst)
! check_program(conf, "ssnes9x", "snes", 0, sysfirst)
! check_program(conf, "zsnes", "snes", 0, sysfirst)
! check_program(conf, "lame", "lame",0,sysfirst)
! check_program(conf, "cdparanoia","cdparanoia",0,sysfirst)
! check_program(conf, "oggenc","oggenc",0,sysfirst)
check_config(conf)
--- 280,286 ----
print 'System path first=%s' % ( ['NO','YES'][sysfirst])
!
! for program, valname, needed in EXTERNAL_PROGRAMS:
! check_program(conf, program, valname, needed, sysfirst)
check_config(conf)
***************
*** 225,301 ****
sys.exit()
-
- vals_geometry = ['800x600', '768x576', '640x480']
- vals_display = ['x11', 'fbdev', 'dfbmga', 'mga', 'dxr3', 'sdl']
- vals_tv = ['ntsc', 'pal', 'secam']
- vals_chanlist = ['us-bcast', 'us-cable', 'us-cable-hrc',
- 'japan-bcast', 'japan-cable', 'europe-west',
- 'europe-east', 'italy', 'newzealand', 'australia',
- 'ireland', 'france', 'china-bcast', 'southafrica',
- 'argentina', 'canada-cable']
-
- def check_config(conf):
- if not conf.geometry in vals_geometry:
- print 'geometry must be one of: %s' % ' '.join(vals_geometry)
- sys.exit(1)
-
- if not conf.display in vals_display:
- print 'display must be one of: %s' % ' '.join(vals_display)
- sys.exit(1)
-
- if not conf.tv in vals_tv:
- print 'tv must be one of: %s' % ' '.join(vals_tv)
- sys.exit(1)
-
- if not conf.chanlist in vals_chanlist:
- print 'chanlist must be one of: %s' % ' '.join(vals_chanlist)
- sys.exit(1)
-
-
- def create_config(conf):
-
- print 'Creating freevo.conf...',
-
- fd = open('freevo.conf', 'w')
- for val in dir(conf):
- if val[0:2] == '__': continue
-
- # Some Python magic to get all members of the struct
- fd.write('%s = %s\n' % (val, conf.__dict__[val]))
-
- print 'done'
-
-
- def check_program(conf, name, variable, necessary, sysfirst):
-
- # Check for programs both in the path and the runtime apps dir
- search_dirs_runtime = ['./runtime/apps', './runtime/apps/mplayer',
- './runtime/apps/tvtime']
- if sysfirst:
- search_dirs = os.environ['PATH'].split(':') + search_dirs_runtime
- else:
- search_dirs = search_dirs_runtime + os.environ['PATH'].split(':')
-
- print 'checking for %-13s' % (name+'...'),
-
- for dirname in search_dirs:
- filename = os.path.join(dirname, name)
- if os.path.exists(filename) and os.path.isfile(filename):
- print filename
- conf.__dict__[variable] = filename
- break
- else:
- if necessary:
- print
"********************************************************************"
- print "ERROR: can't find %s" % name
- print "Please install the application respectively put it in your path."
- print "Freevo won't work without it."
- print
"********************************************************************"
- print
- print
- sys.exit(1)
- else:
- print "not found (deactivated)"
-
- if __name__ == '__main__':
- main()
--- 315,316 ----
-------------------------------------------------------
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa00100003ave/direct;at.aspnet_072303_01/01
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
