Update of /cvsroot/freevo/freevo/src/plugins
In directory sc8-pr-cvs1:/tmp/cvs-serv9133
Modified Files:
mixer.py ossmixer.py
Log Message:
use osd to display volume
Index: mixer.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/plugins/mixer.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** mixer.py 9 Nov 2003 16:04:09 -0000 1.12
--- mixer.py 2 Jan 2004 14:03:32 -0000 1.13
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.13 2004/01/02 14:03:32 dischi
+ # use osd to display volume
+ #
# Revision 1.12 2003/11/09 16:04:09 dischi
# add step size in VOL+- an arg
***************
*** 61,69 ****
import fcntl
import struct
- import config
import os
import plugin
! import event as em
--- 64,73 ----
import fcntl
import struct
import os
+ import config
+ import rc
import plugin
! from event import *
***************
*** 137,162 ****
eventhandler to handle the VOL events
"""
! # Handle volume control
! if event == em.MIXER_VOLUP:
! _debug_('Got VOLUP %s' % event.arg)
! if( config.MAJOR_AUDIO_CTRL == 'VOL' ):
self.incMainVolume(event.arg)
! elif( config.MAJOR_AUDIO_CTRL == 'PCM' ):
self.incPcmVolume(event.arg)
return True
! elif event == em.MIXER_VOLDOWN:
! _debug_('Got VOLDOWN %s' % event.arg)
if( config.MAJOR_AUDIO_CTRL == 'VOL' ):
self.decMainVolume(event.arg)
elif( config.MAJOR_AUDIO_CTRL == 'PCM' ):
self.decPcmVolume(event.arg)
return True
! elif event == em.MIXER_MUTE:
! if self.getMuted() == 1: self.setMuted(0)
! else: self.setMuted(1)
! return True
!
return True
--- 141,169 ----
eventhandler to handle the VOL events
"""
! if event == MIXER_VOLUP:
! if config.MAJOR_AUDIO_CTRL == 'VOL':
self.incMainVolume(event.arg)
! rc.post_event(Event(OSD_MESSAGE, arg=_('Volume: %s%%') %
self.getVolume()))
! elif config.MAJOR_AUDIO_CTRL == 'PCM':
self.incPcmVolume(event.arg)
+ rc.post_event(Event(OSD_MESSAGE, arg=_('Volume: %s%%') %
self.getVolume()))
return True
! elif event == MIXER_VOLDOWN:
if( config.MAJOR_AUDIO_CTRL == 'VOL' ):
self.decMainVolume(event.arg)
+ rc.post_event(Event(OSD_MESSAGE, arg=_('Volume: %s%%') %
self.getVolume()))
elif( config.MAJOR_AUDIO_CTRL == 'PCM' ):
self.decPcmVolume(event.arg)
+ rc.post_event(Event(OSD_MESSAGE, arg=_('Volume: %s%%') %
self.getVolume()))
return True
! elif event == MIXER_MUTE:
! if self.getMuted() == 1:
! rc.post_event(Event(OSD_MESSAGE, arg=_('Volume: %s%%') %
self.getVolume()))
! self.setMuted(0)
! else:
! rc.post_event(Event(OSD_MESSAGE, arg=_('Mute')))
! self.setMuted(1)
return True
***************
*** 167,173 ****
def _setVolume(self, device, volume):
if self.mixfd:
! _debug_('Volume = %d' % volume)
! if volume < 0: volume = 0
! if volume > 100: volume = 100
vol = (volume << 8) | (volume)
data = struct.pack('L', vol)
--- 174,181 ----
def _setVolume(self, device, volume):
if self.mixfd:
! if volume < 0:
! volume = 0
! if volume > 100:
! volume = 100
vol = (volume << 8) | (volume)
data = struct.pack('L', vol)
***************
*** 183,189 ****
def setMuted(self, mute):
self.muted = mute
! if mute == 1: self._setVolume(self.SOUND_MIXER_WRITE_VOLUME, 0)
! else:self._setVolume(self.SOUND_MIXER_WRITE_VOLUME, self.mainVolume)
def getMainVolume(self):
return(self.mainVolume)
--- 191,205 ----
def setMuted(self, mute):
self.muted = mute
! if mute == 1:
! self._setVolume(self.SOUND_MIXER_WRITE_VOLUME, 0)
! else:
! self._setVolume(self.SOUND_MIXER_WRITE_VOLUME, self.mainVolume)
+ def getVolume(self):
+ if config.MAJOR_AUDIO_CTRL == 'VOL':
+ return self.mainVolume
+ elif config.MAJOR_AUDIO_CTRL == 'PCM':
+ return self.pcmVolume
+
def getMainVolume(self):
return(self.mainVolume)
***************
*** 195,208 ****
def incMainVolume(self, step=5):
self.mainVolume += step
! if self.mainVolume > 100: self.mainVolume = 100
self._setVolume(self.SOUND_MIXER_WRITE_VOLUME, self.mainVolume)
def decMainVolume(self, step=5):
self.mainVolume -= step
! if self.mainVolume < 0: self.mainVolume = 0
self._setVolume(self.SOUND_MIXER_WRITE_VOLUME, self.mainVolume)
def getPcmVolume(self):
! return( self.pcmVolume )
def setPcmVolume(self, volume):
--- 211,226 ----
def incMainVolume(self, step=5):
self.mainVolume += step
! if self.mainVolume > 100:
! self.mainVolume = 100
self._setVolume(self.SOUND_MIXER_WRITE_VOLUME, self.mainVolume)
def decMainVolume(self, step=5):
self.mainVolume -= step
! if self.mainVolume < 0:
! self.mainVolume = 0
self._setVolume(self.SOUND_MIXER_WRITE_VOLUME, self.mainVolume)
def getPcmVolume(self):
! return self.pcmVolume
def setPcmVolume(self, volume):
***************
*** 212,221 ****
def incPcmVolume(self, step=5):
self.pcmVolume += step
! if self.pcmVolume > 100: self.pcmvolume = 100
self._setVolume( self.SOUND_MIXER_WRITE_PCM, self.pcmVolume )
def decPcmVolume(self, step=5):
self.pcmVolume -= step
! if self.pcmVolume < 0: self.pcmVolume = 0
self._setVolume( self.SOUND_MIXER_WRITE_PCM, self.pcmVolume )
--- 230,241 ----
def incPcmVolume(self, step=5):
self.pcmVolume += step
! if self.pcmVolume > 100:
! self.pcmvolume = 100
self._setVolume( self.SOUND_MIXER_WRITE_PCM, self.pcmVolume )
def decPcmVolume(self, step=5):
self.pcmVolume -= step
! if self.pcmVolume < 0:
! self.pcmVolume = 0
self._setVolume( self.SOUND_MIXER_WRITE_PCM, self.pcmVolume )
***************
*** 248,263 ****
def decIgainVolume(self, step=5):
self.igainVolume -= step
! if self.igainVolume < 0: self.igainVolume = 0
os.system('aumix -i-%s > /dev/null 2>&1 &' % step)
def incIgainVolume(self, step=5):
self.igainVolume += step
! if self.igainVolume > 100: self.igainVolume = 100
os.system('aumix -i+%s > /dev/null 2>&1 &' % step)
def setOgainVolume(self, volume):
"""For Ogain on SB Live Cards"""
! if volume > 100: volume = 100
! elif volume < 0: volume = 0
self.ogainVolume = volume
os.system('aumix -o%s > /dev/null 2>&1' % volume)
--- 268,287 ----
def decIgainVolume(self, step=5):
self.igainVolume -= step
! if self.igainVolume < 0:
! self.igainVolume = 0
os.system('aumix -i-%s > /dev/null 2>&1 &' % step)
def incIgainVolume(self, step=5):
self.igainVolume += step
! if self.igainVolume > 100:
! self.igainVolume = 100
os.system('aumix -i+%s > /dev/null 2>&1 &' % step)
def setOgainVolume(self, volume):
"""For Ogain on SB Live Cards"""
! if volume > 100:
! volume = 100
! elif volume < 0:
! volume = 0
self.ogainVolume = volume
os.system('aumix -o%s > /dev/null 2>&1' % volume)
***************
*** 273,281 ****
self.setIgainVolume(0) # SB Live input from TV Card.
-
-
- # Simple test...
- if __name__ == '__main__':
- mixer = PluginInterface()
- mixer.setPcmVolume(50)
-
--- 297,298 ----
Index: ossmixer.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/plugins/ossmixer.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ossmixer.py 12 Oct 2003 11:05:48 -0000 1.6
--- ossmixer.py 2 Jan 2004 14:03:32 -0000 1.7
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.7 2004/01/02 14:03:32 dischi
+ # use osd to display volume
+ #
# Revision 1.6 2003/10/12 11:05:48 dischi
# respect config.CONTROL_ALL_AUDIO
***************
*** 68,76 ****
import struct
- import config
import os
import plugin
! import event as em
import ossaudiodev
--- 71,80 ----
import struct
import os
+ import config
import plugin
! import rc
! from event import *
import ossaudiodev
***************
*** 127,150 ****
"""
# Handle volume control
! if event == em.MIXER_VOLUP:
! print "Got VOLUP"
! if( config.MAJOR_AUDIO_CTRL == 'VOL' ):
self.incMainVolume()
! elif( config.MAJOR_AUDIO_CTRL == 'PCM' ):
self.incPcmVolume()
return True
! elif event == em.MIXER_VOLDOWN:
! if( config.MAJOR_AUDIO_CTRL == 'VOL' ):
self.decMainVolume()
! elif( config.MAJOR_AUDIO_CTRL == 'PCM' ):
self.decPcmVolume()
return True
! elif event == em.MIXER_MUTE:
! if self.getMuted() == 1: self.setMuted(0)
! else: self.setMuted(1)
! return True
!
return True
--- 131,159 ----
"""
# Handle volume control
! if event == MIXER_VOLUP:
! if config.MAJOR_AUDIO_CTRL == 'VOL':
self.incMainVolume()
! rc.post_event(Event(OSD_MESSAGE, arg=_('Volume: %s%%') %
self.getVolume()))
! elif config.MAJOR_AUDIO_CTRL == 'PCM':
self.incPcmVolume()
+ rc.post_event(Event(OSD_MESSAGE, arg=_('Volume: %s%%') %
self.getVolume()))
return True
! elif event == MIXER_VOLDOWN:
! if config.MAJOR_AUDIO_CTRL == 'VOL':
self.decMainVolume()
! rc.post_event(Event(OSD_MESSAGE, arg=_('Volume: %s%%') %
self.getVolume()))
! elif config.MAJOR_AUDIO_CTRL == 'PCM':
self.decPcmVolume()
+ rc.post_event(Event(OSD_MESSAGE, arg=_('Volume: %s%%') %
self.getVolume()))
return True
! elif event == MIXER_MUTE:
! if self.getMuted() == 1:
! rc.post_event(Event(OSD_MESSAGE, arg=_('Volume: %s%%') %
self.getVolume()))
! self.setMuted(0)
! else:
! rc.post_event(Event(OSD_MESSAGE, arg=_('Mute')))
! self.setMuted(1)
return True
***************
*** 155,162 ****
def _setVolume(self, device, volume):
if self.mixfd and (self.mixfd.controls() & (1 << device)):
! # Don't do anything if there is no control
! _debug_('Volume = %d' % volume, 2)
! if volume < 0: volume = 0
! if volume > 100: volume = 100
self.mixfd.set(device, (volume,volume))
--- 164,171 ----
def _setVolume(self, device, volume):
if self.mixfd and (self.mixfd.controls() & (1 << device)):
! if volume < 0:
! volume = 0
! if volume > 100:
! volume = 100
self.mixfd.set(device, (volume,volume))
***************
*** 166,174 ****
def setMuted(self, mute):
self.muted = mute
! if mute == 1: self._setVolume(ossaudiodev.SOUND_MIXER_VOLUME, 0)
! else:self._setVolume(ossaudiodev.SOUND_MIXER_VOLUME, self.mainVolume)
def getMainVolume(self):
! return(self.mainVolume)
def setMainVolume(self, volume):
--- 175,191 ----
def setMuted(self, mute):
self.muted = mute
! if mute == 1:
! self._setVolume(ossaudiodev.SOUND_MIXER_VOLUME, 0)
! else:
! self._setVolume(ossaudiodev.SOUND_MIXER_VOLUME, self.mainVolume)
+ def getVolume(self):
+ if config.MAJOR_AUDIO_CTRL == 'VOL':
+ return self.mainVolume
+ elif config.MAJOR_AUDIO_CTRL == 'PCM':
+ return self.pcmVolume
+
def getMainVolume(self):
! return self.mainVolume
def setMainVolume(self, volume):
***************
*** 178,191 ****
def incMainVolume(self):
self.mainVolume += 5
! if self.mainVolume > 100: self.mainVolume = 100
self._setVolume(ossaudiodev.SOUND_MIXER_VOLUME, self.mainVolume)
def decMainVolume(self):
self.mainVolume -= 5
! if self.mainVolume < 0: self.mainVolume = 0
self._setVolume(ossaudiodev.SOUND_MIXER_VOLUME, self.mainVolume)
def getPcmVolume(self):
! return( self.pcmVolume )
def setPcmVolume(self, volume):
--- 195,210 ----
def incMainVolume(self):
self.mainVolume += 5
! if self.mainVolume > 100:
! self.mainVolume = 100
self._setVolume(ossaudiodev.SOUND_MIXER_VOLUME, self.mainVolume)
def decMainVolume(self):
self.mainVolume -= 5
! if self.mainVolume < 0:
! self.mainVolume = 0
self._setVolume(ossaudiodev.SOUND_MIXER_VOLUME, self.mainVolume)
def getPcmVolume(self):
! return self.pcmVolume
def setPcmVolume(self, volume):
***************
*** 195,204 ****
def incPcmVolume(self):
self.pcmVolume += 5
! if self.pcmVolume > 100: self.pcmvolume = 100
self._setVolume( ossaudiodev.SOUND_MIXER_PCM, self.pcmVolume )
def decPcmVolume(self):
self.pcmVolume -= 5
! if self.pcmVolume < 0: self.pcmVolume = 0
self._setVolume( ossaudiodev.SOUND_MIXER_PCM, self.pcmVolume )
--- 214,225 ----
def incPcmVolume(self):
self.pcmVolume += 5
! if self.pcmVolume > 100:
! self.pcmvolume = 100
self._setVolume( ossaudiodev.SOUND_MIXER_PCM, self.pcmVolume )
def decPcmVolume(self):
self.pcmVolume -= 5
! if self.pcmVolume < 0:
! self.pcmVolume = 0
self._setVolume( ossaudiodev.SOUND_MIXER_PCM, self.pcmVolume )
***************
*** 229,243 ****
def decIgainVolume(self):
self.igainVolume -= 5
! if self.igainVolume < 0: self.igainVolume = 0
self._setVolume(ossaudiodev.SOUND_MIXER_IGAIN, volume)
def incIgainVolume(self):
self.igainVolume += 5
! if self.igainVolume > 100: self.igainVolume = 100
self._setVolume(ossaudiodev.SOUND_MIXER_IGAIN, volume)
def setOgainVolume(self, volume):
! if volume > 100: volume = 100
! elif volume < 0: volume = 0
self.ogainVolume = volume
self._setVolume(ossaudiodev.SOUND_MIXER_IGAIN, volume)
--- 250,268 ----
def decIgainVolume(self):
self.igainVolume -= 5
! if self.igainVolume < 0:
! self.igainVolume = 0
self._setVolume(ossaudiodev.SOUND_MIXER_IGAIN, volume)
def incIgainVolume(self):
self.igainVolume += 5
! if self.igainVolume > 100:
! self.igainVolume = 100
self._setVolume(ossaudiodev.SOUND_MIXER_IGAIN, volume)
def setOgainVolume(self, volume):
! if volume > 100:
! volume = 100
! elif volume < 0:
! volume = 0
self.ogainVolume = volume
self._setVolume(ossaudiodev.SOUND_MIXER_IGAIN, volume)
***************
*** 253,261 ****
self.setIgainVolume(0) # SB Live input from TV Card.
-
-
- # Simple test...
- if __name__ == '__main__':
- mixer = PluginInterface()
- mixer.setPcmVolume(50)
-
--- 278,279 ----
-------------------------------------------------------
This SF.net email is sponsored by: IBM Linux Tutorials.
Become an expert in LINUX or just sharpen your skills. Sign up for IBM's
Free Linux Tutorials. Learn everything from the bash shell to sys admin.
Click now! http://ads.osdn.com/?ad_id=1278&alloc_id=3371&op=click
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
