[Python-checkins] python/dist/src/Modules ossaudiodev.c,1.12,1.13

[gward@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Modules
In directory sc8-pr-cvs1:/tmp/cvs-serv8540

Modified Files:
	ossaudiodev.c 
Log Message:
Whitespace fixes to conform to coding standards.


Index: ossaudiodev.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/ossaudiodev.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** ossaudiodev.c	30 Dec 2002 02:58:04 -0000	1.12
--- ossaudiodev.c	30 Dec 2002 03:01:48 -0000	1.13
***************
*** 162,166 ****
      oss_mixer_t *xp;
      
!     if (!PyArg_ParseTuple (arg, "|ss", &basedev, &mode)) {
      	return NULL;
      }
--- 162,166 ----
      oss_mixer_t *xp;
      
!     if (!PyArg_ParseTuple(arg, "|ss", &basedev, &mode)) {
      	return NULL;
      }
***************
*** 183,187 ****
      }
  
!     if ((fd = open (basedev, imode)) == -1) {
          PyErr_SetFromErrnoWithFilename(PyExc_IOError, basedev);
          return NULL;
--- 183,187 ----
      }
  
!     if ((fd = open(basedev, imode)) == -1) {
          PyErr_SetFromErrnoWithFilename(PyExc_IOError, basedev);
          return NULL;
***************
*** 673,677 ****
  
  static PyObject *
! oss_mixer_devices (oss_mixer_t *self, PyObject *args)
  {
      return _do_ioctl_1_internal(self->fd, args, "devices",
--- 673,677 ----
  
  static PyObject *
! oss_mixer_devices(oss_mixer_t *self, PyObject *args)
  {
      return _do_ioctl_1_internal(self->fd, args, "devices",
***************
*** 680,684 ****
  
  static PyObject *
! oss_mixer_stereodevices (oss_mixer_t *self, PyObject *args)
  {
      return _do_ioctl_1_internal(self->fd, args, "stereodevices",
--- 680,684 ----
  
  static PyObject *
! oss_mixer_stereodevices(oss_mixer_t *self, PyObject *args)
  {
      return _do_ioctl_1_internal(self->fd, args, "stereodevices",
***************
*** 687,691 ****
  
  static PyObject *
! oss_mixer_recdevices (oss_mixer_t *self, PyObject *args)
  {
      return _do_ioctl_1_internal(self->fd, args, "recdevices",
--- 687,691 ----
  
  static PyObject *
! oss_mixer_recdevices(oss_mixer_t *self, PyObject *args)
  {
      return _do_ioctl_1_internal(self->fd, args, "recdevices",
***************
*** 694,732 ****
  
  static PyObject *
! oss_mixer_get (oss_mixer_t *self, PyObject *args)
  {
      int channel, volume;
      
      /* Can't use _do_ioctl_1 because of encoded arg thingy. */
!     if (!PyArg_ParseTuple (args, "i:get", &channel))
      	return NULL;
      
      if (channel < 0 || channel > SOUND_MIXER_NRDEVICES) {
!     	PyErr_SetString (OSSAudioError, "Invalid mixer channel specified.");
  	return NULL;
      }
      
!     if (ioctl (self->fd, MIXER_READ(channel), &volume) == -1)
      	return PyErr_SetFromErrno(PyExc_IOError);
      
!     return Py_BuildValue ("(ii)", volume & 0xff, (volume & 0xff00) >> 8);
  }
  
  static PyObject *
! oss_mixer_set (oss_mixer_t *self, PyObject *args)
  {
      int channel, volume, leftVol, rightVol;
      
      /* Can't use _do_ioctl_1 because of encoded arg thingy. */
!     if (!PyArg_ParseTuple (args, "i(ii):set", &channel, &leftVol, &rightVol))
      	return NULL;
  	    
      if (channel < 0 || channel > SOUND_MIXER_NRDEVICES) {
!     	PyErr_SetString (OSSAudioError, "Invalid mixer channel specified.");
  	return NULL;
      }
      
      if (leftVol < 0 || rightVol < 0 || leftVol > 100 || rightVol > 100) {
!     	PyErr_SetString (OSSAudioError, "Volumes must be between 0 and 100.");
  	return NULL;
      }
--- 694,732 ----
  
  static PyObject *
! oss_mixer_get(oss_mixer_t *self, PyObject *args)
  {
      int channel, volume;
      
      /* Can't use _do_ioctl_1 because of encoded arg thingy. */
!     if (!PyArg_ParseTuple(args, "i:get", &channel))
      	return NULL;
      
      if (channel < 0 || channel > SOUND_MIXER_NRDEVICES) {
!     	PyErr_SetString(OSSAudioError, "Invalid mixer channel specified.");
  	return NULL;
      }
      
!     if (ioctl(self->fd, MIXER_READ(channel), &volume) == -1)
      	return PyErr_SetFromErrno(PyExc_IOError);
      
!     return Py_BuildValue("(ii)", volume & 0xff, (volume & 0xff00) >> 8);
  }
  
  static PyObject *
! oss_mixer_set(oss_mixer_t *self, PyObject *args)
  {
      int channel, volume, leftVol, rightVol;
      
      /* Can't use _do_ioctl_1 because of encoded arg thingy. */
!     if (!PyArg_ParseTuple(args, "i(ii):set", &channel, &leftVol, &rightVol))
      	return NULL;
  	    
      if (channel < 0 || channel > SOUND_MIXER_NRDEVICES) {
!     	PyErr_SetString(OSSAudioError, "Invalid mixer channel specified.");
  	return NULL;
      }
      
      if (leftVol < 0 || rightVol < 0 || leftVol > 100 || rightVol > 100) {
!     	PyErr_SetString(OSSAudioError, "Volumes must be between 0 and 100.");
  	return NULL;
      }
***************
*** 734,745 ****
      volume = (rightVol << 8) | leftVol;
      
!     if (ioctl (self->fd, MIXER_WRITE(channel), &volume) == -1)
      	return PyErr_SetFromErrno(PyExc_IOError);
     
!     return Py_BuildValue ("(ii)", volume & 0xff, (volume & 0xff00) >> 8);
  }
  
  static PyObject *
! oss_mixer_getrecsrc (oss_mixer_t *self, PyObject *args)
  {
      return _do_ioctl_1_internal(self->fd, args, "getrecsrc",
--- 734,745 ----
      volume = (rightVol << 8) | leftVol;
      
!     if (ioctl(self->fd, MIXER_WRITE(channel), &volume) == -1)
      	return PyErr_SetFromErrno(PyExc_IOError);
     
!     return Py_BuildValue("(ii)", volume & 0xff, (volume & 0xff00) >> 8);
  }
  
  static PyObject *
! oss_mixer_getrecsrc(oss_mixer_t *self, PyObject *args)
  {
      return _do_ioctl_1_internal(self->fd, args, "getrecsrc",
***************
*** 748,752 ****
  
  static PyObject *
! oss_mixer_setrecsrc (oss_mixer_t *self, PyObject *args)
  {
      return _do_ioctl_1(self->fd, args, "setrecsrc",
--- 748,752 ----
  
  static PyObject *
! oss_mixer_setrecsrc(oss_mixer_t *self, PyObject *args)
  {
      return _do_ioctl_1(self->fd, args, "setrecsrc",