Update of /cvsroot/freevo/freevo/src/plugins
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6655/src/plugins
Modified Files:
mbus.py rom_drives.py usb.py
Log Message:
more eventhandler cleanups
Index: rom_drives.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/plugins/rom_drives.py,v
retrieving revision 1.99
retrieving revision 1.100
diff -C2 -d -r1.99 -r1.100
*** rom_drives.py 16 Jul 2005 10:07:25 -0000 1.99
--- rom_drives.py 16 Jul 2005 15:00:34 -0000 1.100
***************
*** 61,65 ****
import sysconfig
import config
! import application.eventhandler
import plugin
import util
--- 61,65 ----
import sysconfig
import config
! import application
import plugin
import util
***************
*** 136,142 ****
the main menu.
"""
! if not application.eventhandler.is_menu():
return False
!
if event == MENU_GOTO_MAINMENU:
# going to main menu, umount all media
--- 136,143 ----
the main menu.
"""
! menuw = application.get_active()
! if not menuw or menuw.get_name() != 'menu':
return False
!
if event == MENU_GOTO_MAINMENU:
# going to main menu, umount all media
***************
*** 147,151 ****
return False
- menuw = application.eventhandler.get()
if not menuw or len(menuw.menustack) > 1:
# not in main menu
--- 148,151 ----
***************
*** 707,711 ****
media.drive_status = None
! if application.eventhandler.is_menu():
# check only in the menu
for media in rom_drives:
--- 707,712 ----
media.drive_status = None
! menuw = application.get_active()
! if menuw and menuw.get_name() == 'menu':
# check only in the menu
for media in rom_drives:
Index: usb.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/plugins/usb.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** usb.py 16 Jul 2005 11:40:28 -0000 1.18
--- usb.py 16 Jul 2005 15:00:41 -0000 1.19
***************
*** 11,14 ****
--- 11,17 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.19 2005/07/16 15:00:41 dischi
+ # more eventhandler cleanups
+ #
# Revision 1.18 2005/07/16 11:40:28 dischi
# remove poll_menu_only
***************
*** 75,79 ****
import util
from gui.windows import WaitBox
! import application.eventhandler
import logging
--- 78,82 ----
import util
from gui.windows import WaitBox
! import application
import logging
***************
*** 120,124 ****
poll to check for devices
"""
! if not application.eventhandler.is_menu():
return False
--- 123,128 ----
poll to check for devices
"""
! menuw = application.get_active()
! if not menuw or menuw.get_name() != 'menu':
return False
Index: mbus.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/plugins/mbus.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** mbus.py 16 Jul 2005 13:38:34 -0000 1.4
--- mbus.py 16 Jul 2005 15:00:33 -0000 1.5
***************
*** 3,7 ****
import mcomm
import plugin
! import application.eventhandler
import event
--- 3,7 ----
import mcomm
import plugin
! import application
import event
***************
*** 27,31 ****
file = self.parse_parameter(val, ( str, ))
! if not application.eventhandler.is_menu():
return mcomm.RPCError('freevo not in menu mode')
--- 27,32 ----
file = self.parse_parameter(val, ( str, ))
! menuw = application.get_active()
! if not menuw or menuw.get_name() != 'menu':
return mcomm.RPCError('freevo not in menu mode')
***************
*** 48,52 ****
Send status on rpc status request.
"""
! if not application.eventhandler.is_menu():
self.idle_time = 0
status = { 'idle': self.idle_time }
--- 49,54 ----
Send status on rpc status request.
"""
! menuw = application.get_active()
! if not menuw or menuw.get_name() != 'menu':
self.idle_time = 0
status = { 'idle': self.idle_time }
-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
