Update of /cvsroot/freevo/freevo/src/plugins
In directory sc8-pr-cvs1:/tmp/cvs-serv18006
Modified Files:
mixer.py ossmixer.py
Log Message:
respect config.CONTROL_ALL_AUDIO
Index: mixer.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/plugins/mixer.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** mixer.py 4 Oct 2003 18:37:29 -0000 1.8
--- mixer.py 12 Oct 2003 11:05:48 -0000 1.9
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.9 2003/10/12 11:05:48 dischi
+ # respect config.CONTROL_ALL_AUDIO
+ #
# Revision 1.8 2003/10/04 18:37:29 dischi
# i18n changes and True/False usage
***************
*** 200,205 ****
def setLineinVolume(self, volume):
! self.lineinVolume = volume
! self._setVolume(self.SOUND_MIXER_WRITE_LINE, volume)
def getLineinVolume(self):
--- 203,209 ----
def setLineinVolume(self, volume):
! if config.CONTROL_ALL_AUDIO:
! self.lineinVolume = volume
! self._setVolume(self.SOUND_MIXER_WRITE_LINE, volume)
def getLineinVolume(self):
***************
*** 207,219 ****
def setMicVolume(self, volume):
! self.micVolume = volume
! self._setVolume(self.SOUND_MIXER_WRITE_MIC, volume)
def setIgainVolume(self, volume):
"""For Igain (input from TV etc) on emu10k cards"""
! if volume > 100: volume = 100
! elif volume < 0: volume = 0
! self.igainVolume = volume
! os.system('aumix -i%s > /dev/null 2>&1 &' % volume)
def getIgainVolume(self):
--- 211,227 ----
def setMicVolume(self, volume):
! if config.CONTROL_ALL_AUDIO:
! self.micVolume = volume
! self._setVolume(self.SOUND_MIXER_WRITE_MIC, volume)
def setIgainVolume(self, volume):
"""For Igain (input from TV etc) on emu10k cards"""
! if config.CONTROL_ALL_AUDIO:
! if volume > 100:
! volume = 100
! elif volume < 0:
! volume = 0
! self.igainVolume = volume
! os.system('aumix -i%s > /dev/null 2>&1 &' % volume)
def getIgainVolume(self):
Index: ossmixer.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/plugins/ossmixer.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ossmixer.py 4 Oct 2003 18:37:29 -0000 1.5
--- ossmixer.py 12 Oct 2003 11:05:48 -0000 1.6
***************
*** 10,13 ****
--- 10,16 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.6 2003/10/12 11:05:48 dischi
+ # respect config.CONTROL_ALL_AUDIO
+ #
# Revision 1.5 2003/10/04 18:37:29 dischi
# i18n changes and True/False usage
***************
*** 201,206 ****
def setLineinVolume(self, volume):
! self.lineinVolume = volume
! self._setVolume(ossaudiodev.SOUND_MIXER_LINE, volume)
def getLineinVolume(self):
--- 204,210 ----
def setLineinVolume(self, volume):
! if config.CONTROL_ALL_AUDIO:
! self.lineinVolume = volume
! self._setVolume(ossaudiodev.SOUND_MIXER_LINE, volume)
def getLineinVolume(self):
***************
*** 208,218 ****
def setMicVolume(self, volume):
! self.micVolume = volume
! self._setVolume(ossaudiodev.SOUND_MIXER_MIC, volume)
def setIgainVolume(self, volume):
! if volume > 100: volume = 100
! elif volume < 0: volume = 0
! self._setVolume(ossaudiodev.SOUND_MIXER_IGAIN, volume)
def getIgainVolume(self):
--- 212,226 ----
def setMicVolume(self, volume):
! if config.CONTROL_ALL_AUDIO:
! self.micVolume = volume
! self._setVolume(ossaudiodev.SOUND_MIXER_MIC, volume)
def setIgainVolume(self, volume):
! if config.CONTROL_ALL_AUDIO:
! if volume > 100:
! volume = 100
! elif volume < 0:
! volume = 0
! self._setVolume(ossaudiodev.SOUND_MIXER_IGAIN, volume)
def getIgainVolume(self):
-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
SourceForge.net hosts over 70,000 Open Source Projects.
See the people who have HELPED US provide better services:
Click here: http://sourceforge.net/supporters.php
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
