Update of /cvsroot/freevo/freevo/src
In directory sc8-pr-cvs1:/tmp/cvs-serv21576
Modified Files:
config.py
Log Message:
toggle between x11 and fbdev based on $DISPLAY
Index: config.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/config.py,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** config.py 25 Aug 2003 12:08:20 -0000 1.44
--- config.py 3 Sep 2003 20:03:34 -0000 1.45
***************
*** 23,26 ****
--- 23,29 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.45 2003/09/03 20:03:34 dischi
+ # toggle between x11 and fbdev based on $DISPLAY
+ #
# Revision 1.44 2003/08/25 12:08:20 outlyer
# Additional compatibility patches for FreeBSD from Lars Eggert
***************
*** 250,259 ****
# fall back to x11 if display is mga or fb and DISPLAY ist set
! if CONF.display in ('mga', 'fbcon') and os.environ.has_key('DISPLAY') and \
! os.environ['DISPLAY']:
! print 'Warning: display is set to %s, but the environment has DISPLAY set' %
CONF.display
! print 'this could mess up your X display, setting display to x11.'
! print 'If you really want to do this, start \'DISPLAY="" freevo\''
! CONF.display='x11'
# Load freevo_config.py:
--- 253,271 ----
# fall back to x11 if display is mga or fb and DISPLAY ist set
! # or switch to fbdev if we have no DISPLAY and x11 or dga is used
! if not HELPER:
! if os.environ.has_key('DISPLAY') and os.environ['DISPLAY']:
! if CONF.display in ('mga', 'fbdev'):
! print 'Warning: display is set to %s, but the environment ' %
CONF.display + \
! 'has DISPLAY=%s.' % os.environ['DISPLAY']
! print 'this could mess up your X display, setting display to x11.'
! print 'If you really want to do this, start \'DISPLAY="" freevo\''
! CONF.display='x11'
! else:
! if CONF.display == 'x11':
! print 'Warning: display is set to %s, but the environment ' %
CONF.display + \
! 'has no DISPLAY set.'
! print 'Setting display to fbdev.'
! CONF.display='fbdev'
# Load freevo_config.py:
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
