Author: dmeyer
Date: Sat Feb  3 20:23:41 2007
New Revision: 9150

Modified:
   trunk/ui/src/fxditem.py
   trunk/ui/src/playlist.py

Log:
better imports

Modified: trunk/ui/src/fxditem.py
==============================================================================
--- trunk/ui/src/fxditem.py     (original)
+++ trunk/ui/src/fxditem.py     Sat Feb  3 20:23:41 2007
@@ -54,8 +54,8 @@
 
 import util
 import plugin
+import media
 
-from media import MediaPlugin, get_plugins
 from menu import Item, Action, Menu
 
 # get logging object
@@ -71,7 +71,7 @@
     _callbacks.append((types, node, callback))
 
     
-class PluginInterface(MediaPlugin):
+class PluginInterface(media.MediaPlugin):
     """
     Class to handle fxd files in directories
     """

Modified: trunk/ui/src/playlist.py
==============================================================================
--- trunk/ui/src/playlist.py    (original)
+++ trunk/ui/src/playlist.py    Sat Feb  3 20:23:41 2007
@@ -46,7 +46,7 @@
 import util
 import plugin
 import fxditem
-from media import MediaPlugin, get_plugins
+import media
 
 from event import *
 from menu import Action, Item, MediaItem, Menu
@@ -176,7 +176,7 @@
         # Note: playlist is a list of Items, strings (filenames) or a
         # beacon queries now.
 
-        plugins = get_plugins(self.display_type)
+        plugins = media.get_plugins(self.display_type)
         for item in playlist:
 
             if isinstance(item, Item):
@@ -450,12 +450,12 @@
 
 
 
-class PluginInterface(MediaPlugin):
+class PluginInterface(media.MediaPlugin):
     """
     Plugin class for playlist items
     """
     def __init__(self):
-        MediaPlugin.__init__(self)
+        media.MediaPlugin.__init__(self)
 
         # add fxd parser callback
         fxditem.add_parser([], 'playlist', self.fxdhandler)

-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier.
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog

Reply via email to