Menu
▾
▴
[Freevo-cvslog] freevo/src/video configure.py,1.5,1.6 mplayer.py,1.23,1.24 videoitem.py,1.16,1.17
|
From: <di...@us...> - 2003-03-02 14:58:27
|
Update of /cvsroot/freevo/freevo/src/video
In directory sc8-pr-cvs1:/tmp/cvs-serv12382
Modified Files:
configure.py mplayer.py videoitem.py
Log Message:
Removed osd.clearscreen and if we have the NEW_SKIN deactivate
skin.popupbox, refresh, etc. Use menuw.show and menuw.hide to do this.
Index: configure.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/video/configure.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** configure.py 7 Jan 2003 19:45:17 -0000 1.5
--- configure.py 2 Mar 2003 14:58:23 -0000 1.6
***************
*** 10,13 ****
--- 10,17 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.6 2003/03/02 14:58:23 dischi
+ # Removed osd.clearscreen and if we have the NEW_SKIN deactivate
+ # skin.popupbox, refresh, etc. Use menuw.show and menuw.hide to do this.
+ #
# Revision 1.5 2003/01/07 19:45:17 dischi
# small bugfix
***************
*** 57,62 ****
import re
- menuw = menu.get_singleton()
-
#
--- 61,64 ----
***************
*** 166,170 ****
! def main_menu(item):
moviemenu = menu.Menu('CONFIG MENU', main_menu_generate(item))
menuw.pushmenu(moviemenu)
--- 168,172 ----
! def main_menu(item, menuw):
moviemenu = menu.Menu('CONFIG MENU', main_menu_generate(item))
menuw.pushmenu(moviemenu)
Index: mplayer.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/video/mplayer.py,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** mplayer.py 24 Feb 2003 21:13:18 -0000 1.23
--- mplayer.py 2 Mar 2003 14:58:23 -0000 1.24
***************
*** 10,13 ****
--- 10,17 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.24 2003/03/02 14:58:23 dischi
+ # Removed osd.clearscreen and if we have the NEW_SKIN deactivate
+ # skin.popupbox, refresh, etc. Use menuw.show and menuw.hide to do this.
+ #
# Revision 1.23 2003/02/24 21:13:18 dischi
# Moved RC_MPLAYER_CMDS higher in the eventhandler
***************
*** 140,150 ****
import util # Various utilities
import childapp # Handle child applications
- import menu # The menu widget class
import mixer # Controls the volumes for playback and recording
import osd # The OSD class, used to communicate with the OSD daemon
import rc # The RemoteControl class.
- import skin # Cause audio handling needs skin functions.
import fnmatch
# RegExp
import re
--- 144,160 ----
import util # Various utilities
import childapp # Handle child applications
import mixer # Controls the volumes for playback and recording
import osd # The OSD class, used to communicate with the OSD daemon
import rc # The RemoteControl class.
import fnmatch
+ if not config.NEW_SKIN:
+ import menu
+ import skin
+
+ menuwidget = menu.get_singleton()
+ skin = skin.get_singleton()
+
+
# RegExp
import re
***************
*** 158,164 ****
osd = osd.get_singleton()
rc = rc.get_singleton()
- menuwidget = menu.get_singleton()
mixer = mixer.get_singleton()
- skin = skin.get_singleton()
# Module variable that contains an initialized MPlayer() object
--- 168,172 ----
***************
*** 232,238 ****
if mode == 'file' and not os.path.isfile(filename) and not network_play:
! skin.PopupBox('%s\nnot found!' % os.path.basename(filename))
! time.sleep(2.0)
! menuwidget.refresh()
# XXX We should really use return more.
return 0
--- 240,248 ----
if mode == 'file' and not os.path.isfile(filename) and not network_play:
! if not config.NEW_SKIN:
! skin.PopupBox('%s\nnot found!' % os.path.basename(filename))
! time.sleep(2.0)
! menuwidget.refresh()
!
# XXX We should really use return more.
return 0
***************
*** 321,328 ****
# This should _really_ be set to zero when playing other audio.
- # clear the screen for mplayer
- osd.clearscreen(color=osd.COL_BLACK)
- osd.update()
-
self.thread.play_mode = self.mode
self.thread.item = item
--- 331,334 ----
***************
*** 361,370 ****
if self.mode == 'dvdnav':
self.thread.app.write('dvdnav 6\n')
else:
self.stop()
self.thread.item = None
rc.app = None
! menuwidget.refresh(reload=1)
! return TRUE
if event == rc.EXIT:
--- 367,378 ----
if self.mode == 'dvdnav':
self.thread.app.write('dvdnav 6\n')
+ return TRUE
else:
+ print self.item
self.stop()
self.thread.item = None
rc.app = None
! print self.item
! return self.item.eventhandler(event)
if event == rc.EXIT:
***************
*** 373,381 ****
rc.app = None
menuwidget.refresh(reload=1)
! return TRUE
if event == rc.PLAY_END or event == rc.USER_END:
self.stop()
rc.app = None
return self.item.eventhandler(event)
--- 381,390 ----
rc.app = None
menuwidget.refresh(reload=1)
! return self.item.eventhandler(event)
if event == rc.PLAY_END or event == rc.USER_END:
self.stop()
rc.app = None
+ print self.item
return self.item.eventhandler(event)
***************
*** 383,389 ****
self.stop()
rc.app = None
! skin.PopupBox('The DVD is protected, see the docs for more info!')
! osd.update()
! time.sleep(5.0)
# Forward the event as if it was a regular end of item
event = rc.PLAY_END
--- 392,401 ----
self.stop()
rc.app = None
!
! if not config.NEW_SKIN:
! skin.PopupBox('The DVD is protected, see the docs for more info!')
! osd.update()
! time.sleep(5.0)
!
# Forward the event as if it was a regular end of item
event = rc.PLAY_END
Index: videoitem.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/video/videoitem.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** videoitem.py 24 Feb 2003 04:21:40 -0000 1.16
--- videoitem.py 2 Mar 2003 14:58:23 -0000 1.17
***************
*** 10,13 ****
--- 10,17 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.17 2003/03/02 14:58:23 dischi
+ # Removed osd.clearscreen and if we have the NEW_SKIN deactivate
+ # skin.popupbox, refresh, etc. Use menuw.show and menuw.hide to do this.
+ #
# Revision 1.16 2003/02/24 04:21:40 krister
# Mathieu Weber's bugfix for multipart movies
***************
*** 37,76 ****
# file on the harddisc.
#
- # Revision 1.9 2002/12/30 15:56:11 dischi
- # store label in the videoitem
- #
- # Revision 1.8 2002/12/22 12:59:34 dischi
- # Added function sort() to (audio|video|games|image) item to set the sort
- # mode. Default is alphabetical based on the name. For mp3s and images
- # it's based on the filename. Sort by date is in the code but deactivated
- # (see mediamenu.py how to enable it)
- #
- # Revision 1.7 2002/12/22 12:23:30 dischi
- # Added deinterlacing in the config menu
- #
- # Revision 1.6 2002/12/12 11:45:02 dischi
- # Moved all icons to skins/icons
- #
- # Revision 1.5 2002/12/03 20:03:43 dischi
- # Now it's impossible to show the dvd title menu when you are already in this
- # menu. Also dvdnav support is now working (more or less, depends if mplayer
- # can dvdnav your dvd). Give it a try and select dvdnav in the item menu
- #
- # Revision 1.4 2002/12/03 19:16:23 dischi
- # Some changes in actions(): play will always play the item, for DVD/VCD
- # this means track 1. The DVD/VCD title menu is an extra action
- #
- # Revision 1.3 2002/11/28 19:56:12 dischi
- # Added copy function
- #
- # Revision 1.2 2002/11/26 20:58:44 dischi
- # o Fixed bug that not only the first character of mplayer_options is used
- # o added the configure stuff again (without play from stopped position
- # because the mplayer -ss option is _very_ broken)
- # o Various fixes in DVD playpack
- #
- # Revision 1.1 2002/11/24 13:58:45 dischi
- # code cleanup
- #
#
# -----------------------------------------------------------------------
--- 41,44 ----
***************
*** 109,123 ****
FALSE = 0
- import menu
import rc
! import skin
! import osd
import time
import copy
rc = rc.get_singleton()
! skin = skin.get_singleton()
! osd = osd.get_singleton()
! menuwidget = menu.get_singleton()
from item import Item
--- 77,93 ----
FALSE = 0
import rc
! import menu
import time
import copy
rc = rc.get_singleton()
!
! if not config.NEW_SKIN:
! import skin
! import osd
! skin = skin.get_singleton()
! osd = osd.get_singleton()
!
from item import Item
***************
*** 249,253 ****
"""
self.parent.current_item = self
-
if self.subitems:
--- 219,222 ----
***************
*** 264,271 ****
else:
# TODO: prompt for the right media
! skin.PopupBox('Media not found for file %s' % (file))
! time.sleep(2.0)
! rc.post_event(rc.PLAY_END)
! menuwidget.refresh()
return
elif self.mode == 'dvd' or self.mode == 'vcd':
--- 233,241 ----
else:
# TODO: prompt for the right media
! if not config.NEW_SKIN:
! skin.PopupBox('Media not found for file %s' % (file))
! time.sleep(2.0)
! rc.post_event(rc.PLAY_END)
! menuw.refresh()
return
elif self.mode == 'dvd' or self.mode == 'vcd':
***************
*** 275,282 ****
self.media = media
else:
! skin.PopupBox('Media not found for %s track %s' % (self.mode, file))
! time.sleep(2.0)
! rc.post_event(rc.PLAY_END)
! menuwidget.refresh()
return
--- 245,253 ----
self.media = media
else:
! if not config.NEW_SKIN:
! skin.PopupBox('Media not found for %s track %s' % (self.mode, file))
! time.sleep(2.0)
! rc.post_event(rc.PLAY_END)
! menuw.refresh()
return
***************
*** 317,320 ****
--- 288,297 ----
mplayer_options += ' -vop pp=fd'
+
+ self.menuw = menuw
+ self.menuw_visible = menuw.visible
+
+ if menuw.visible:
+ menuw.hide()
self.video_player.play(file, mplayer_options, self)
***************
*** 325,328 ****
--- 302,307 ----
"""
self.video_player.stop()
+ if self.menuw_visible:
+ menuw.show()
***************
*** 346,349 ****
--- 325,333 ----
mplayer_options += ' %s' % arg
+ self.menuw = menuw
+ self.menuw_visible = menuw.visible
+
+ if menuw.visible:
+ menuw.hide()
self.video_player.play('', mplayer_options, self, 'dvdnav')
***************
*** 359,365 ****
# Figure out the number of titles on this disc
! skin.PopupBox('Scanning disc, be patient...',
! icon='skins/icons/misc/cdrom_mount.png')
! osd.update()
os.system('rm -f /tmp/mplayer_dvd_%s.log /tmp/mplayer_dvd_done_%s' % (uid, uid))
--- 343,352 ----
# Figure out the number of titles on this disc
! if not config.NEW_SKIN:
! skin.PopupBox('Scanning disc, be patient...',
! icon='skins/icons/misc/cdrom_mount.png')
! osd.update()
!
!
os.system('rm -f /tmp/mplayer_dvd_%s.log /tmp/mplayer_dvd_done_%s' % (uid, uid))
***************
*** 452,458 ****
uid = os.getuid()
! skin.PopupBox('Scanning disc, be patient...',
! icon='skins/icons/misc/cdrom_mount.png')
! osd.update()
os.system('rm -f /tmp/mplayer_dvd_%s.log /tmp/mplayer_dvd_done_%s' % (uid, uid))
--- 439,448 ----
uid = os.getuid()
! if not config.NEW_SKIN:
! skin.PopupBox('Scanning disc, be patient...',
! icon='skins/icons/misc/cdrom_mount.png')
! osd.update()
!
!
os.system('rm -f /tmp/mplayer_dvd_%s.log /tmp/mplayer_dvd_done_%s' % (uid, uid))
***************
*** 484,488 ****
p.parse(line)
! configure.main_menu(self)
--- 474,478 ----
p.parse(line)
! configure.main_menu(self, menuw)
***************
*** 491,495 ****
eventhandler for this item
"""
!
# PLAY_END: do have have to play another file?
if self.subitems:
--- 481,489 ----
eventhandler for this item
"""
!
! # when called from mplayer.py, there is no menuw
! if not menuw:
! menuw = self.menuw
!
# PLAY_END: do have have to play another file?
if self.subitems:
***************
*** 507,514 ****
pass
# show configure menu
if event == rc.MENU:
self.video_player.stop()
! self.settings()
return TRUE
--- 501,514 ----
pass
+ if event in ( rc.STOP, rc.SELECT, rc.EXIT, rc.PLAY_END, rc.USER_END ) and \
+ self.menuw_visible:
+ menuw.show()
+ return TRUE
+
# show configure menu
if event == rc.MENU:
self.video_player.stop()
! self.settings(menuw=menuw)
! menuw.show()
return TRUE
|