Author: dmeyer
Date: Sat Apr 14 19:48:49 2007
New Revision: 9443
Modified:
trunk/ui/src/application/handler.py
trunk/ui/src/audio/audioitem.py
trunk/ui/src/directory.py
trunk/ui/src/event.py
trunk/ui/src/games/emulator.py
trunk/ui/src/input/eventmap.py
trunk/ui/src/input/plugins/sdl.py
trunk/ui/src/plugins/lcd.py
trunk/ui/src/plugins/mbus.py
trunk/ui/src/video/plugins/resume.py
trunk/ui/src/video/videoitem.py
Log:
event cleanup
Modified: trunk/ui/src/application/handler.py
==============================================================================
--- trunk/ui/src/application/handler.py (original)
+++ trunk/ui/src/application/handler.py Sat Apr 14 19:48:49 2007
@@ -46,7 +46,7 @@
# freevo imports
from freevo.ui.input import set_mapping
-from freevo.ui.event import *
+from freevo.ui.event import TOGGLE_APPLICATION
# the logging object
log = logging.getLogger()
Modified: trunk/ui/src/audio/audioitem.py
==============================================================================
--- trunk/ui/src/audio/audioitem.py (original)
+++ trunk/ui/src/audio/audioitem.py Sat Apr 14 19:48:49 2007
@@ -43,7 +43,6 @@
# freevo imports
from freevo.ui.menu import MediaItem, Action
-from freevo.ui.event import *
# audio player
import player as audioplayer
Modified: trunk/ui/src/directory.py
==============================================================================
--- trunk/ui/src/directory.py (original)
+++ trunk/ui/src/directory.py Sat Apr 14 19:48:49 2007
@@ -51,7 +51,8 @@
from menu import Item, Files, Action, ActionItem, MediaPlugin
from playlist import Playlist
-from event import *
+from event import OSD_MESSAGE, DIRECTORY_CHANGE_DISPLAY_TYPE, \
+ DIRECTORY_TOGGLE_HIDE_PLAYED
from application import MessageWindow
Modified: trunk/ui/src/event.py
==============================================================================
--- trunk/ui/src/event.py (original)
+++ trunk/ui/src/event.py Sat Apr 14 19:48:49 2007
@@ -156,14 +156,6 @@
#
-# Audio module
-#
-
-AUDIO_SEND_MPLAYER_CMD = Event('AUDIO_SEND_MPLAYER_CMD')
-AUDIO_LOG = Event('AUDIO_LOG')
-
-
-#
# Image module
#
@@ -185,15 +177,6 @@
IMAGE_MOVE = Event('IMAGE_MOVE')
#
-# Games module
-#
-
-GAMES_CONFIG = Event('GAMES_CONFIG')
-GAMES_RESET = Event('GAMES_RESET')
-GAMES_SNAPSHOT = Event('GAMES_SNAPSHOT')
-
-
-#
# Input boxes
#
Modified: trunk/ui/src/games/emulator.py
==============================================================================
--- trunk/ui/src/games/emulator.py (original)
+++ trunk/ui/src/games/emulator.py Sat Apr 14 19:48:49 2007
@@ -50,7 +50,7 @@
from freevo.resources import ResourceHandler
from freevo.ui.mainmenu import MainMenuItem, MainMenuPlugin
from freevo.ui.directory import DirItem
-from freevo.ui.event import *
+from freevo.ui.event import EJECT
from freevo.ui import plugin, application
from freevo.ui.menu import Item, Action, Menu
from freevo.ui.plugins.mediamenu import MediaMenu
Modified: trunk/ui/src/input/eventmap.py
==============================================================================
--- trunk/ui/src/input/eventmap.py (original)
+++ trunk/ui/src/input/eventmap.py Sat Apr 14 19:48:49 2007
@@ -230,8 +230,6 @@
'STOP' : STOP,
'SELECT' : STOP,
'MENU' : MENU,
- 'DISPLAY' : GAMES_CONFIG,
- 'ENTER' : GAMES_RESET
}
GLOBAL_EVENTS = {
Modified: trunk/ui/src/input/plugins/sdl.py
==============================================================================
--- trunk/ui/src/input/plugins/sdl.py (original)
+++ trunk/ui/src/input/plugins/sdl.py Sat Apr 14 19:48:49 2007
@@ -40,7 +40,6 @@
from freevo.ui.input import KEYBOARD_MAP
from freevo.ui import config
from freevo.ui.menu import Item
-from freevo.ui.event import *
from interface import InputPlugin
# get logging object
Modified: trunk/ui/src/plugins/lcd.py
==============================================================================
--- trunk/ui/src/plugins/lcd.py (original)
+++ trunk/ui/src/plugins/lcd.py Sat Apr 14 19:48:49 2007
@@ -32,7 +32,7 @@
from freevo import plugin
from freevo.ui import application
-from freevo.ui.event import *
+from freevo.ui.event import PLAY_START, PLAY_END, STOP, OSD_MESSAGE
import logging
log = logging.getLogger()
Modified: trunk/ui/src/plugins/mbus.py
==============================================================================
--- trunk/ui/src/plugins/mbus.py (original)
+++ trunk/ui/src/plugins/mbus.py Sat Apr 14 19:48:49 2007
@@ -9,7 +9,7 @@
# freevo ui imports
from freevo.ui import application
-from freevo.ui.event import *
+from freevo.ui.event import PLAY_START, PLAY_END
from freevo.ui.directory import DirItem
from freevo.ui.menu import MediaPlugin
Modified: trunk/ui/src/video/plugins/resume.py
==============================================================================
--- trunk/ui/src/video/plugins/resume.py (original)
+++ trunk/ui/src/video/plugins/resume.py Sat Apr 14 19:48:49 2007
@@ -37,7 +37,7 @@
import freevo.conf
from freevo.ui.menu import Action, Menu, ItemPlugin
-from freevo.ui.event import *
+from freevo.ui.event import PLAY_START, PLAY_END, STOP
# the logging object
log = logging.getLogger()
Modified: trunk/ui/src/video/videoitem.py
==============================================================================
--- trunk/ui/src/video/videoitem.py (original)
+++ trunk/ui/src/video/videoitem.py Sat Apr 14 19:48:49 2007
@@ -51,7 +51,7 @@
from freevo.ui.application import MessageWindow, ConfirmWindow
from freevo.ui.menu import Menu, MediaItem, Files, Action
-from freevo.ui.event import *
+from freevo.ui.event import PLAY_END
# video imports
import configure
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
