Update of /cvsroot/freevo/freevo/src/gui/displays
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8388/src/gui/displays
Modified Files:
__init__.py bmovl.py bmovl2.py ivtv_fb.py ivtv_osd.py sdl.py
Log Message:
renamed SKIN_* and OSD_* variables to GUI_*
Index: bmovl2.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/gui/displays/bmovl2.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** bmovl2.py 20 Nov 2004 18:23:01 -0000 1.8
--- bmovl2.py 31 Dec 2004 11:57:41 -0000 1.9
***************
*** 9,12 ****
--- 9,15 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.9 2004/12/31 11:57:41 dischi
+ # renamed SKIN_* and OSD_* variables to GUI_*
+ #
# Revision 1.8 2004/11/20 18:23:01 dischi
# use python logger module for debug
***************
*** 93,97 ****
import childapp
arg = [config.MPLAYER_CMD] + self.mplayer_args.split(' ') + \
! [config.OSD_BACKGROUND_VIDEO]
self.child = childapp.Instance( arg, stop_osd = 0 )
time.sleep(2)
--- 96,100 ----
import childapp
arg = [config.MPLAYER_CMD] + self.mplayer_args.split(' ') + \
! [config.GUI_BACKGROUND_VIDEO]
self.child = childapp.Instance( arg, stop_osd = 0 )
time.sleep(2)
Index: ivtv_osd.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/gui/displays/ivtv_osd.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ivtv_osd.py 6 Oct 2004 18:59:52 -0000 1.3
--- ivtv_osd.py 31 Dec 2004 11:57:41 -0000 1.4
***************
*** 7,10 ****
--- 7,13 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.4 2004/12/31 11:57:41 dischi
+ # renamed SKIN_* and OSD_* variables to GUI_*
+ #
# Revision 1.3 2004/10/06 18:59:52 dischi
# remove import rc
***************
*** 67,74 ****
"""
Hide the output display. In most cases this does nothing since
! a simple window doesn't matter. If OSD_STOP_WHEN_PLAYING the
display will be shut down.
"""
! if config.OSD_STOP_WHEN_PLAYING:
self.stop()
--- 70,77 ----
"""
Hide the output display. In most cases this does nothing since
! a simple window doesn't matter. If GUI_STOP_WHEN_PLAYING the
display will be shut down.
"""
! if config.GUI_STOP_WHEN_PLAYING:
self.stop()
***************
*** 78,82 ****
Show the output window again if it is not visible
"""
! if config.OSD_STOP_WHEN_PLAYING:
self.restart()
--- 81,85 ----
Show the output window again if it is not visible
"""
! if config.GUI_STOP_WHEN_PLAYING:
self.restart()
Index: bmovl.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/gui/displays/bmovl.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** bmovl.py 19 Dec 2004 10:36:31 -0000 1.9
--- bmovl.py 31 Dec 2004 11:57:41 -0000 1.10
***************
*** 67,71 ****
config.CONF.height, self.get_fname() ),
'-vo', config.MPLAYER_VO_DEV, '-ao', 'null',
! config.OSD_BACKGROUND_VIDEO ]
self.child = None
self.restart()
--- 67,71 ----
config.CONF.height, self.get_fname() ),
'-vo', config.MPLAYER_VO_DEV, '-ao', 'null',
! config.GUI_BACKGROUND_VIDEO ]
self.child = None
self.restart()
Index: sdl.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/gui/displays/sdl.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** sdl.py 27 Nov 2004 19:07:50 -0000 1.10
--- sdl.py 31 Dec 2004 11:57:41 -0000 1.11
***************
*** 7,10 ****
--- 7,13 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.11 2004/12/31 11:57:41 dischi
+ # renamed SKIN_* and OSD_* variables to GUI_*
+ #
# Revision 1.10 2004/11/27 19:07:50 dischi
# add exec before/after support
***************
*** 63,77 ****
self.animation_possible = True
plugin.activate('input.sdl')
! if config.OSD_SDL_EXEC_AFTER_STARTUP:
! print config.OSD_SDL_EXEC_AFTER_STARTUP
! os.system(config.OSD_SDL_EXEC_AFTER_STARTUP)
def hide(self):
"""
Hide the output display. In most cases this does nothing since
! a simple window doesn't matter. If OSD_STOP_WHEN_PLAYING the
ygame display will be shut down.
"""
! if config.OSD_STOP_WHEN_PLAYING:
self.stop()
--- 66,80 ----
self.animation_possible = True
plugin.activate('input.sdl')
! if config.GUI_SDL_EXEC_AFTER_STARTUP:
! print config.GUI_SDL_EXEC_AFTER_STARTUP
! os.system(config.GUI_SDL_EXEC_AFTER_STARTUP)
def hide(self):
"""
Hide the output display. In most cases this does nothing since
! a simple window doesn't matter. If GUI_STOP_WHEN_PLAYING the
ygame display will be shut down.
"""
! if config.GUI_STOP_WHEN_PLAYING:
self.stop()
***************
*** 81,85 ****
Show the output window again if it is not visible
"""
! if config.OSD_STOP_WHEN_PLAYING:
self.restart()
--- 84,88 ----
Show the output window again if it is not visible
"""
! if config.GUI_STOP_WHEN_PLAYING:
self.restart()
***************
*** 93,98 ****
self.freeze()
self.running = False
! if config.OSD_SDL_EXEC_AFTER_CLOSE:
! os.system(config.OSD_SDL_EXEC_AFTER_CLOSE)
def restart(self):
--- 96,101 ----
self.freeze()
self.running = False
! if config.GUI_SDL_EXEC_AFTER_CLOSE:
! os.system(config.GUI_SDL_EXEC_AFTER_CLOSE)
def restart(self):
Index: ivtv_fb.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/gui/displays/ivtv_fb.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ivtv_fb.py 6 Oct 2004 18:59:52 -0000 1.2
--- ivtv_fb.py 31 Dec 2004 11:57:41 -0000 1.3
***************
*** 7,10 ****
--- 7,13 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.3 2004/12/31 11:57:41 dischi
+ # renamed SKIN_* and OSD_* variables to GUI_*
+ #
# Revision 1.2 2004/10/06 18:59:52 dischi
# remove import rc
***************
*** 70,77 ****
"""
Hide the output display. In most cases this does nothing since
! a simple window doesn't matter. If OSD_STOP_WHEN_PLAYING the
display will be shut down.
"""
! if config.OSD_STOP_WHEN_PLAYING:
self.stop()
--- 73,80 ----
"""
Hide the output display. In most cases this does nothing since
! a simple window doesn't matter. If GUI_STOP_WHEN_PLAYING the
display will be shut down.
"""
! if config.GUI_STOP_WHEN_PLAYING:
self.stop()
***************
*** 81,85 ****
Show the output window again if it is not visible
"""
! if config.OSD_STOP_WHEN_PLAYING:
self.restart()
--- 84,88 ----
Show the output window again if it is not visible
"""
! if config.GUI_STOP_WHEN_PLAYING:
self.restart()
Index: __init__.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/gui/displays/__init__.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** __init__.py 19 Dec 2004 10:36:31 -0000 1.6
--- __init__.py 31 Dec 2004 11:57:41 -0000 1.7
***************
*** 7,10 ****
--- 7,13 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.7 2004/12/31 11:57:41 dischi
+ # renamed SKIN_* and OSD_* variables to GUI_*
+ #
# Revision 1.6 2004/12/19 10:36:31 dischi
# update bmovl fifo handling
***************
*** 64,68 ****
"""
if not display_stack:
! exec('from %s import Display' % config.OSD_DISPLAY.lower())
display_stack.append(Display((config.CONF.width, config.CONF.height),
True))
return display_stack[-1]
--- 67,71 ----
"""
if not display_stack:
! exec('from %s import Display' % config.GUI_DISPLAY.lower())
display_stack.append(Display((config.CONF.width, config.CONF.height),
True))
return display_stack[-1]
-------------------------------------------------------
The SF.Net email is sponsored by: Beat the post-holiday blues
Get a FREE limited edition SourceForge.net t-shirt from ThinkGeek.
It's fun and FREE -- well, almost....http://www.thinkgeek.com/sfshirt
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
