Fix buffer size and sample rate handling in JackAlsaAdapter.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@3355 0c269be4-1314-0410-8aa9-9f06e86f4224

ChangeLog

@@ -27,6 +27,7 @@ Michael Voigt
 
 	* Fix JackNetDriver::Close method.
         * For audio device reservation, add card_to_num function.
+        * Fix buffer size and sample rate handling in JackAlsaAdapter.
 
 2009-02-23 Stephane Letz  <letz@grame.fr>
 

common/JackAudioAdapterInterface.cpp

@@ -106,7 +106,7 @@ namespace Jack
             fPlaybackRingBuffer[i]->Reset();
     }
 
-    void JackAudioAdapterInterface::ResampleFactor ( jack_nframes_t& frame1, jack_nframes_t& frame2 )
+    void JackAudioAdapterInterface::ResampleFactor ( jack_time_t& frame1, jack_time_t& frame2 )
     {
         jack_time_t time = GetMicroSeconds();
 

common/JackAudioAdapterInterface.h

@@ -184,7 +184,7 @@ namespace Jack
             fHostDLL.IncFrame ( callback_usec );
         }
 
-        void ResampleFactor ( jack_nframes_t& frame1, jack_nframes_t& frame2 );
+        void ResampleFactor ( jack_time_t& frame1, jack_time_t& frame2 );
 
         void SetInputs ( int inputs )
         {

common/JackNetAdapter.cpp

@@ -367,7 +367,7 @@ namespace Jack
             return SOCKET_ERROR;
 
         //get the resample factor,
-        jack_nframes_t time1, time2;
+        jack_time_t time1, time2;
         ResampleFactor ( time1, time2 );
 
         //resample input data,

linux/alsa/JackAlsaAdapter.cpp

@@ -66,9 +66,11 @@ namespace Jack
                     fAudioInterface.fCardName = strdup ( param->value.str );
                     break;
                 case 'r':
+		    fAudioInterface.fFrequency = param->value.ui;
                     SetAdaptedSampleRate ( param->value.ui );
                     break;
                 case 'p':
+		    fAudioInterface.fBuffering = param->value.ui;
                     SetAdaptedBufferSize ( param->value.ui );
                     break;
                 case 'q':
@@ -153,7 +155,7 @@ namespace Jack
         bool failure = false;
 
         //compute resampling factor
-        jack_nframes_t time1, time2;
+        jack_time_t time1, time2;
         ResampleFactor ( time1, time2 );
 
         //resample inputs

macosx/coreaudio/JackCoreAudioAdapter.cpp

@@ -295,7 +295,7 @@ OSStatus JackCoreAudioAdapter::Render(void *inRefCon,
     AudioUnitRender(adapter->fAUHAL, ioActionFlags, inTimeStamp, 1, inNumberFrames, adapter->fInputData);
     bool failure = false;
 
-    jack_nframes_t time1, time2;
+    jack_time_t time1, time2;
     adapter->ResampleFactor(time1, time2);
 
     for (int i = 0; i < adapter->fCaptureChannels; i++) {

solaris/oss/JackOSSAdapter.cpp

@@ -604,7 +604,7 @@ bool JackOSSAdapter::Execute()
         return false;
 
     bool failure = false;
-    jack_nframes_t time1, time2; 
+    jack_time_t time1, time2; 
     ResampleFactor(time1, time2);
   
     for (int i = 0; i < fCaptureChannels; i++) {

windows/portaudio/JackPortAudioAdapter.cpp

@@ -38,7 +38,7 @@ namespace Jack
         float** paBuffer;
         bool failure = false;
 
-        jack_nframes_t time1, time2;
+        jack_time_t time1, time2;
         adapter->ResampleFactor ( time1, time2 );
 
         paBuffer = (float**)inputBuffer;