Author: duncan
Date: Mon Dec 10 11:32:42 2007
New Revision: 10195
Log:
Corrected IDENTIFY_MEDIA event detection, it's a plug-in event.
Modified:
branches/rel-1/freevo/src/plugins/autoshutdown.py
branches/rel-1/freevo/src/plugins/freevoscreensaver.py
branches/rel-1/freevo/src/plugins/screensaver/__init__.py
branches/rel-1/freevo/src/plugins/vfd.py
Modified: branches/rel-1/freevo/src/plugins/autoshutdown.py
==============================================================================
--- branches/rel-1/freevo/src/plugins/autoshutdown.py (original)
+++ branches/rel-1/freevo/src/plugins/autoshutdown.py Mon Dec 10 11:32:42 2007
@@ -348,7 +348,7 @@
def eventhandler(self, event=None, menuw=None, arg=None):
if not self.lock:
- if not event.name == 'IDENTIFY_MEDIA' and not event.name ==
'SCREENSAVER_START':
+ if plugin.isevent(event) != 'IDENTIFY_MEDIA' and event.name !=
'SCREENSAVER_START':
self.reset()
_debug_("timer reset, received event %s" % event.name, 2)
return FALSE
Modified: branches/rel-1/freevo/src/plugins/freevoscreensaver.py
==============================================================================
--- branches/rel-1/freevo/src/plugins/freevoscreensaver.py (original)
+++ branches/rel-1/freevo/src/plugins/freevoscreensaver.py Mon Dec 10
11:32:42 2007
@@ -115,13 +115,14 @@
return FALSE
# gotta ignore these or video screensavers shutoff before they begin
- if event.name == 'VIDEO_START' or event.name == 'PLAY_START' or
event.name == 'VIDEO_END' or event.name == 'PLAY_END':
+ if event.name == 'VIDEO_START' or event.name == 'PLAY_START' or \
+ event.name == 'VIDEO_END' or event.name == 'PLAY_END':
return FALSE
if self.screensaver_showing :
self.stop_saver()
- if not event.name == 'IDENTIFY_MEDIA':
+ if plugin.isevent(event) != 'IDENTIFY_MEDIA':
self.last_event = time.time()
return FALSE
Modified: branches/rel-1/freevo/src/plugins/screensaver/__init__.py
==============================================================================
--- branches/rel-1/freevo/src/plugins/screensaver/__init__.py (original)
+++ branches/rel-1/freevo/src/plugins/screensaver/__init__.py Mon Dec 10
11:32:42 2007
@@ -93,10 +93,11 @@
return True
# gotta ignore these or video screensavers shutoff before they begin
- if event.name == 'VIDEO_START' or event.name == 'PLAY_START' or
event.name == 'VIDEO_END' or event.name == 'PLAY_END':
+ if event.name == 'VIDEO_START' or event.name == 'PLAY_START' or \
+ event.name == 'VIDEO_END' or event.name == 'PLAY_END':
return False
- if not event.name == 'IDENTIFY_MEDIA':
+ if plugin.isevent(event) != 'IDENTIFY_MEDIA':
self.last_event = time.time()
if self.screensaver_showing :
Modified: branches/rel-1/freevo/src/plugins/vfd.py
==============================================================================
--- branches/rel-1/freevo/src/plugins/vfd.py (original)
+++ branches/rel-1/freevo/src/plugins/vfd.py Mon Dec 10 11:32:42 2007
@@ -807,17 +807,17 @@
elif event == 'SEEK':
self.set_running((event.arg < 0 and Rewind) or FastForward)
update_bits = 1
- elif event == 'PLUGIN_EVENT IDENTIFY_MEDIA':
- media = event.arg[0]
- self.set_media((hasattr(media.item, 'type') and Clock) or 0)
- update_bits = 1
elif event == 'VIDEO_START':
self.set_running(Play)
update_bits = 1
elif event == 'VIDEO_END':
self.set_running(Stop)
update_bits = 1
- elif event == 'PLUGIN_EVENT USB':
+ elif plugin.isevent(event) == 'IDENTIFY_MEDIA':
+ media = event.arg[0]
+ self.set_media((hasattr(media.item, 'type') and Clock) or 0)
+ update_bits = 1
+ elif plugin.isevent(event) == 'USB':
pass
elif event == 'FUNCTION_CALL':
pass
@@ -827,6 +827,8 @@
pass
elif event == 'TOGGLE_OSD':
pass
+ elif event == 'MENU_PROCESS_END':
+ pass
elif event == 'MENU_UP':
pass
elif event == 'MENU_DOWN':
-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
