Update of /cvsroot/freevo/freevo/src/audio/plugins
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5452
Modified Files:
Tag: rel-1-5
radioplayer.py
Log Message:
Committing Georg Kunzel's radio player patch to make the elapsed time
actually work correctly.
Index: radioplayer.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/audio/plugins/radioplayer.py,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -C2 -d -r1.10 -r1.10.2.1
*** radioplayer.py 10 Jul 2004 12:33:38 -0000 1.10
--- radioplayer.py 26 Mar 2005 20:14:59 -0000 1.10.2.1
***************
*** 10,13 ****
--- 10,17 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.10.2.1 2005/03/26 20:14:59 mikeruelle
+ # Committing Georg Kunzel's radio player patch to make the elapsed time
+ # actually work correctly.
+ #
# Revision 1.10 2004/07/10 12:33:38 dischi
# header cleanup
***************
*** 71,75 ****
self.app_mode = 'audio'
self.app = None
! self.starttime = 0
def rate(self, item):
--- 75,79 ----
self.app_mode = 'audio'
self.app = None
! self.starttime = 0
def rate(self, item):
***************
*** 91,96 ****
self.playerGUI = playerGUI
self.item = item
! self.item.elapsed = 0
! self.starttime = time.time()
print 'RadioPlayer.play() %s' % self.item.station
--- 95,100 ----
self.playerGUI = playerGUI
self.item = item
! self.item.elapsed = 0
! self.starttime = time.time()
print 'RadioPlayer.play() %s' % self.item.station
***************
*** 98,106 ****
self.mode = 'play'
mixer = plugin.getbyname('MIXER')
! mixer.setLineinVolume(config.TV_IN_VOLUME)
! mixer.setIgainVolume(config.TV_IN_VOLUME)
! mixer.setMicVolume(config.TV_IN_VOLUME)
os.system('%s -qf %s' % (config.RADIO_CMD, self.item.station))
! thread.start_new_thread(self.__update_thread, ())
return None
--- 102,113 ----
self.mode = 'play'
mixer = plugin.getbyname('MIXER')
! if mixer:
! mixer.setLineinVolume(config.TV_IN_VOLUME)
! mixer.setIgainVolume(config.TV_IN_VOLUME)
! mixer.setMicVolume(config.TV_IN_VOLUME)
! else:
! print 'Radio Player failed to find a mixer'
os.system('%s -qf %s' % (config.RADIO_CMD, self.item.station))
! thread.start_new_thread(self.__update_thread, ())
return None
***************
*** 113,119 ****
self.mode = 'stop'
mixer = plugin.getbyname('MIXER')
! mixer.setLineinVolume(0)
! mixer.setIgainVolume(0)
! mixer.setMicVolume(0)
os.system('%s -qm' % config.RADIO_CMD)
--- 120,129 ----
self.mode = 'stop'
mixer = plugin.getbyname('MIXER')
! if mixer:
! mixer.setLineinVolume(0)
! mixer.setIgainVolume(0)
! mixer.setMicVolume(0)
! else:
! print 'Radio Player failed to find a mixer'
os.system('%s -qm' % config.RADIO_CMD)
***************
*** 126,132 ****
def refresh(self):
print 'Radio Player refresh'
! self.item.elapsed = int(time.time() - self.starttime)
self.playerGUI.refresh()
!
def eventhandler(self, event, menuw=None):
--- 136,155 ----
def refresh(self):
print 'Radio Player refresh'
! self.item.elapsed = self.formattime(int(time.time() - self.starttime))
self.playerGUI.refresh()
!
! def formattime(self,seconds):
! """
! returns string formatted as mins:seconds
! """
! mins = 0
! mins = seconds / 60
! secs = seconds % 60
!
! if secs<10:
! secs = '0%s' % secs
! else:
! secs = '%s' % secs
! return '%i:%s' % (mins,secs)
def eventhandler(self, event, menuw=None):
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
