Update of /cvsroot/freevo/freevo/src/plugins
In directory sc8-pr-cvs1:/tmp/cvs-serv5857
Modified Files:
mixer.py
Log Message:
add step size in VOL+- an arg
Index: mixer.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/plugins/mixer.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** mixer.py 20 Oct 2003 19:37:39 -0000 1.11
--- mixer.py 9 Nov 2003 16:04:09 -0000 1.12
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.12 2003/11/09 16:04:09 dischi
+ # add step size in VOL+- an arg
+ #
# Revision 1.11 2003/10/20 19:37:39 dischi
# better exception handling for ioctl
***************
*** 136,151 ****
# 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
--- 139,155 ----
# 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
***************
*** 189,199 ****
self._setVolume(self.SOUND_MIXER_WRITE_VOLUME, self.mainVolume)
! def incMainVolume(self):
! self.mainVolume += 5
if self.mainVolume > 100: self.mainVolume = 100
self._setVolume(self.SOUND_MIXER_WRITE_VOLUME, self.mainVolume)
! def decMainVolume(self):
! self.mainVolume -= 5
if self.mainVolume < 0: self.mainVolume = 0
self._setVolume(self.SOUND_MIXER_WRITE_VOLUME, self.mainVolume)
--- 193,203 ----
self._setVolume(self.SOUND_MIXER_WRITE_VOLUME, self.mainVolume)
! 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)
***************
*** 206,216 ****
self._setVolume(self.SOUND_MIXER_WRITE_PCM, volume)
! def incPcmVolume(self):
! self.pcmVolume += 5
if self.pcmVolume > 100: self.pcmvolume = 100
self._setVolume( self.SOUND_MIXER_WRITE_PCM, self.pcmVolume )
! def decPcmVolume(self):
! self.pcmVolume -= 5
if self.pcmVolume < 0: self.pcmVolume = 0
self._setVolume( self.SOUND_MIXER_WRITE_PCM, self.pcmVolume )
--- 210,220 ----
self._setVolume(self.SOUND_MIXER_WRITE_PCM, volume)
! 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 )
***************
*** 242,254 ****
return self.igainVolume
! def decIgainVolume(self):
! self.igainVolume -= 5
if self.igainVolume < 0: self.igainVolume = 0
! os.system('aumix -i-5 > /dev/null 2>&1 &')
! def incIgainVolume(self):
! self.igainVolume += 5
if self.igainVolume > 100: self.igainVolume = 100
! os.system('aumix -i+5 > /dev/null 2>&1 &')
def setOgainVolume(self, volume):
--- 246,258 ----
return self.igainVolume
! 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):
-------------------------------------------------------
This SF.Net email sponsored by: ApacheCon 2003,
16-19 November in Las Vegas. Learn firsthand the latest
developments in Apache, PHP, Perl, XML, Java, MySQL,
WebDAV, and more! http://www.apachecon.com/
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
