Update of /cvsroot/freevo/freevo/src/plugins
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22125/src/plugins
Modified Files:
freevoscreensaver.py icecast.py mbus.py mixer.py ossmixer.py
rom_drives.py usb.py yac.py
Log Message:
adjust to new event interface
Index: rom_drives.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/plugins/rom_drives.py,v
retrieving revision 1.97
retrieving revision 1.98
diff -C2 -d -r1.97 -r1.98
*** rom_drives.py 15 Jul 2005 20:42:53 -0000 1.97
--- rom_drives.py 16 Jul 2005 09:48:23 -0000 1.98
***************
*** 436,440 ****
arg = (self, not hasattr(self, 'already_scanned'))
self.already_scanned = True
! eventhandler.post(plugin.event('IDENTIFY_MEDIA', arg=arg))
# release the lock
self.lock.release()
--- 436,440 ----
arg = (self, not hasattr(self, 'already_scanned'))
self.already_scanned = True
! plugin.event('IDENTIFY_MEDIA', arg).post()
# release the lock
self.lock.release()
Index: freevoscreensaver.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/plugins/freevoscreensaver.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** freevoscreensaver.py 15 Jul 2005 20:42:53 -0000 1.8
--- freevoscreensaver.py 16 Jul 2005 09:48:23 -0000 1.9
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.9 2005/07/16 09:48:23 dischi
+ # adjust to new event interface
+ #
# Revision 1.8 2005/07/15 20:42:53 dischi
# remove variable event_listener, not needed anymore
***************
*** 61,65 ****
import plugin
from playlist import Playlist
- import eventhandler
import event as em
import fxditem
--- 64,67 ----
***************
*** 146,150 ****
log.info("Saver got polled %f" % time.time())
if not self.screensaver_showing and (time.time() - self.last_event) >
self.saver_delay :
! eventhandler.post(em.Event("SCREENSAVER_START"))
def start_saver (self):
--- 148,152 ----
log.info("Saver got polled %f" % time.time())
if not self.screensaver_showing and (time.time() - self.last_event) >
self.saver_delay :
! em.Event("SCREENSAVER_START").post()
def start_saver (self):
***************
*** 183,189 ****
os.system('%s' % self.arg2)
elif self.saver_type == 'ssr':
! eventhandler.post(em.STOP)
elif self.saver_type == 'fxd':
! eventhandler.post(em.STOP)
else:
log.error("Unknown saver type to stop.")
--- 185,191 ----
os.system('%s' % self.arg2)
elif self.saver_type == 'ssr':
! em.STOP.post()
elif self.saver_type == 'fxd':
! em.STOP.post()
else:
log.error("Unknown saver type to stop.")
Index: usb.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/plugins/usb.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** usb.py 4 Jun 2005 17:18:13 -0000 1.15
--- usb.py 16 Jul 2005 09:48:24 -0000 1.16
***************
*** 11,14 ****
--- 11,17 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.16 2005/07/16 09:48:24 dischi
+ # adjust to new event interface
+ #
# Revision 1.15 2005/06/04 17:18:13 dischi
# adjust to gui changes
***************
*** 134,138 ****
if changes:
! eventhandler.post(plugin.event('USB'))
self.devices = current_devices
--- 137,141 ----
if changes:
! plugin.event('USB').post()
self.devices = current_devices
Index: ossmixer.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/plugins/ossmixer.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** ossmixer.py 9 Jun 2005 19:43:53 -0000 1.14
--- ossmixer.py 16 Jul 2005 09:48:23 -0000 1.15
***************
*** 23,26 ****
--- 23,29 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.15 2005/07/16 09:48:23 dischi
+ # adjust to new event interface
+ #
# Revision 1.14 2005/06/09 19:43:53 dischi
# clean up eventhandler usage
***************
*** 77,81 ****
import config
import plugin
- import eventhandler
from event import *
--- 80,83 ----
***************
*** 138,145 ****
if config.MAJOR_AUDIO_CTRL == 'VOL':
self.incMainVolume()
! eventhandler.post(Event(OSD_MESSAGE, arg=_('Volume: %s%%') %
self.getVolume()))
elif config.MAJOR_AUDIO_CTRL == 'PCM':
self.incPcmVolume()
! eventhandler.post(Event(OSD_MESSAGE, arg=_('Volume: %s%%') %
self.getVolume()))
return True
--- 140,147 ----
if config.MAJOR_AUDIO_CTRL == 'VOL':
self.incMainVolume()
! OSD_MESSAGE.post(_('Volume: %s%%') % self.getVolume())
elif config.MAJOR_AUDIO_CTRL == 'PCM':
self.incPcmVolume()
! OSD_MESSAGE.post(_('Volume: %s%%') % self.getVolume())
return True
***************
*** 147,162 ****
if config.MAJOR_AUDIO_CTRL == 'VOL':
self.decMainVolume()
! eventhandler.post(Event(OSD_MESSAGE, arg=_('Volume: %s%%') %
self.getVolume()))
elif config.MAJOR_AUDIO_CTRL == 'PCM':
self.decPcmVolume()
! eventhandler.post(Event(OSD_MESSAGE, arg=_('Volume: %s%%') %
self.getVolume()))
return True
elif event == MIXER_MUTE:
if self.getMuted() == 1:
! eventhandler.post(Event(OSD_MESSAGE, arg=_('Volume: %s%%') %
self.getVolume()))
self.setMuted(0)
else:
! eventhandler.post(Event(OSD_MESSAGE, arg=_('Mute')))
self.setMuted(1)
return True
--- 149,164 ----
if config.MAJOR_AUDIO_CTRL == 'VOL':
self.decMainVolume()
! OSD_MESSAGE.post(_('Volume: %s%%') % self.getVolume())
elif config.MAJOR_AUDIO_CTRL == 'PCM':
self.decPcmVolume()
! OSD_MESSAGE.post(_('Volume: %s%%') % self.getVolume())
return True
elif event == MIXER_MUTE:
if self.getMuted() == 1:
! OSD_MESSAGE.post(_('Volume: %s%%') % self.getVolume())
self.setMuted(0)
else:
! OSD_MESSAGE.post(_('Mute'))
self.setMuted(1)
return True
Index: icecast.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/plugins/icecast.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** icecast.py 26 Jul 2004 18:10:18 -0000 1.13
--- icecast.py 16 Jul 2005 09:48:23 -0000 1.14
***************
*** 11,14 ****
--- 11,17 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.14 2005/07/16 09:48:23 dischi
+ # adjust to new event interface
+ #
# Revision 1.13 2004/07/26 18:10:18 dischi
# move global event handling to eventhandler.py
***************
*** 49,53 ****
import time
import plugin
- import eventhandler
import event as em
--- 52,55 ----
***************
*** 158,162 ****
myfile.flush()
myfile.close()
! eventhandler.post(em.MENU_BACK_ONE_MENU)
def actions(self, item):
--- 160,164 ----
myfile.flush()
myfile.close()
! em.MENU_BACK_ONE_MENU.post()
def actions(self, item):
Index: mixer.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/plugins/mixer.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** mixer.py 9 Jun 2005 19:43:53 -0000 1.20
--- mixer.py 16 Jul 2005 09:48:23 -0000 1.21
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.21 2005/07/16 09:48:23 dischi
+ # adjust to new event interface
+ #
# Revision 1.20 2005/06/09 19:43:53 dischi
# clean up eventhandler usage
***************
*** 64,68 ****
import config
- import eventhandler
import plugin
from event import *
--- 67,70 ----
***************
*** 143,150 ****
if config.MAJOR_AUDIO_CTRL == 'VOL':
self.incMainVolume(event.arg)
! eventhandler.post(Event(OSD_MESSAGE, arg=_('Volume: %s%%') %
self.getVolume()))
elif config.MAJOR_AUDIO_CTRL == 'PCM':
self.incPcmVolume(event.arg)
! eventhandler.post(Event(OSD_MESSAGE, arg=_('Volume: %s%%') %
self.getVolume()))
return True
--- 145,152 ----
if config.MAJOR_AUDIO_CTRL == 'VOL':
self.incMainVolume(event.arg)
! OSD_MESSAGE.post(_('Volume: %s%%') % self.getVolume())
elif config.MAJOR_AUDIO_CTRL == 'PCM':
self.incPcmVolume(event.arg)
! OSD_MESSAGE.post(_('Volume: %s%%') % self.getVolume())
return True
***************
*** 152,167 ****
if( config.MAJOR_AUDIO_CTRL == 'VOL' ):
self.decMainVolume(event.arg)
! eventhandler.post(Event(OSD_MESSAGE, arg=_('Volume: %s%%') %
self.getVolume()))
elif( config.MAJOR_AUDIO_CTRL == 'PCM' ):
self.decPcmVolume(event.arg)
! eventhandler.post(Event(OSD_MESSAGE, arg=_('Volume: %s%%') %
self.getVolume()))
return True
elif event == MIXER_MUTE:
if self.getMuted() == 1:
! eventhandler.post(Event(OSD_MESSAGE, arg=_('Volume: %s%%') %
self.getVolume()))
self.setMuted(0)
else:
! eventhandler.post(Event(OSD_MESSAGE, arg=_('Mute')))
self.setMuted(1)
return True
--- 154,169 ----
if( config.MAJOR_AUDIO_CTRL == 'VOL' ):
self.decMainVolume(event.arg)
! OSD_MESSAGE.post(_('Volume: %s%%') % self.getVolume())
elif( config.MAJOR_AUDIO_CTRL == 'PCM' ):
self.decPcmVolume(event.arg)
! OSD_MESSAGE.post(_('Volume: %s%%') % self.getVolume())
return True
elif event == MIXER_MUTE:
if self.getMuted() == 1:
! OSD_MESSAGE.post(_('Volume: %s%%') % self.getVolume())
self.setMuted(0)
else:
! OSD_MESSAGE.post(_('Mute'))
self.setMuted(1)
return True
Index: yac.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/plugins/yac.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** yac.py 26 Jul 2004 18:10:18 -0000 1.3
--- yac.py 16 Jul 2005 09:48:24 -0000 1.4
***************
*** 44,48 ****
import plugin
from event import *
- import eventhandler
class PluginInterface (plugin.DaemonPlugin):
--- 44,47 ----
***************
*** 68,74 ****
if data:
if data[:5] == '@CALL':
! eventhandler.post(Event(OSD_MESSAGE, arg=_('Call: %s') %
data[5:-1]))
else:
! eventhandler.post(Event(OSD_MESSAGE, arg=_('Message: %s')
% data[:-1]))
conn.close()
except:
--- 67,73 ----
if data:
if data[:5] == '@CALL':
! OSD_MESSAGE.post(_('Call: %s') % data[5:-1])
else:
! OSD_MESSAGE.post(_('Message: %s') % data[:-1])
conn.close()
except:
Index: mbus.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/plugins/mbus.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mbus.py 4 Nov 2004 17:35:32 -0000 1.1
--- mbus.py 16 Jul 2005 09:48:23 -0000 1.2
***************
*** 15,25 ****
return mcomm.RPCError('freevo not in menu mode')
- menuw = eventhandler.get()
- parent = menuw.menustack[-1].selected
-
for p in plugin.mimetype(None):
! i = p.get(parent, [ file ] )
if i and hasattr(i[0], 'play'):
! i[0].play(menuw=menuw)
return mcomm.RPCReturn()
--- 15,22 ----
return mcomm.RPCError('freevo not in menu mode')
for p in plugin.mimetype(None):
! i = p.get(None, [ file ] )
if i and hasattr(i[0], 'play'):
! i[0].play()
return mcomm.RPCReturn()
***************
*** 28,31 ****
def __rpc_stop__(self, addr, val):
! eventhandler.post(event.STOP)
return mcomm.RPCReturn()
--- 25,28 ----
def __rpc_stop__(self, addr, val):
! event.STOP.post()
return mcomm.RPCReturn()
-------------------------------------------------------
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
