pd/portaudio/pa_mac_core pa_mac_core.c,1.3,1.3.4.1 - Pd-cvs

28 Jun 2005


      Update of /cvsroot/pure-data/pd/portaudio/pa_mac_core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8219/pa_mac_core
Modified Files:
      Tag: devel_0_38
    pa_mac_core.c 
Log Message:
updating to latest portaudio snapshot
Index: pa_mac_core.c
===================================================================
RCS file: /cvsroot/pure-data/pd/portaudio/pa_mac_core/pa_mac_core.c,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -C2 -d -r1.3 -r1.3.4.1
*** pa_mac_core.c	6 Sep 2004 20:44:39 -0000	1.3
--- pa_mac_core.c	28 Jun 2005 16:30:35 -0000	1.3.4.1
***************
*** 250,253 ****
--- 250,259 ----
              numChannels += buflist->mBuffers[i].mNumberChannels;
          }
+ 		
+ 		if (isInput)
+ 			deviceInfo->maxInputChannels = numChannels;
+ 		else
+ 			deviceInfo->maxOutputChannels = numChannels;
+ 		
          int frameLatency;
          propSize = sizeof(UInt32);
***************
*** 256,265 ****
              double secondLatency = frameLatency / deviceInfo->defaultSampleRate;
              if (isInput) {
-                 deviceInfo->maxInputChannels = numChannels;
                  deviceInfo->defaultLowInputLatency = secondLatency;
                  deviceInfo->defaultHighInputLatency = secondLatency;
              }
              else {
-                 deviceInfo->maxOutputChannels = numChannels;
                  deviceInfo->defaultLowOutputLatency = secondLatency;
                  deviceInfo->defaultHighOutputLatency = secondLatency;
--- 262,269 ----
***************
*** 565,569 ****
      PaError err = paNoError;
      err = SetSampleRate(device, sampleRate, isInput);
!     err = SetFramesPerBuffer(device, framesPerBuffer, isInput);
  }
--- 569,575 ----
      PaError err = paNoError;
      err = SetSampleRate(device, sampleRate, isInput);
!     if( err == paNoError )
!         err = SetFramesPerBuffer(device, framesPerBuffer, isInput);
!     return err;
  }