Code cleanup in Windows JackRouter.

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

common/JackControlAPI.cpp

@@ -932,7 +932,7 @@ jackctl_server_open(
         rc = server_ptr->engine->Open(driver_ptr->desc_ptr, driver_ptr->set_parameters);
         if (rc < 0)
         {
-            jack_error("JackServer::Open() failed with %d", rc);
+            jack_error("JackServer::Open failed with %d", rc);
             goto fail_delete;
         }
 

common/JackNetDriver.cpp

@@ -623,8 +623,11 @@ namespace Jack
             strcpy(value.str, "'hostname'");
             jack_driver_descriptor_add_parameter(desc, &filler, "client-name", 'n', JackDriverParamString, &value, NULL, "Name of the jack client", NULL);
 
+/*  
+Deactivated for now..
             value.ui = 0U;
             jack_driver_descriptor_add_parameter(desc, &filler, "transport-sync", 't', JackDriverParamUInt, &value, NULL, "Sync transport with master's", NULL);
+*/
 
             value.ui = 5U;
             jack_driver_descriptor_add_parameter(desc, &filler, "latency", 'l', JackDriverParamUInt, &value, NULL, "Network latency", NULL);
@@ -699,9 +702,12 @@ namespace Jack
                     case 'n' :
                         strncpy(net_name, param->value.str, JACK_CLIENT_NAME_SIZE);
                         break;
+                    /*
+                    Deactivated for now..
                     case 't' :
                         transport_sync = param->value.ui;
                         break;
+                    */
                     case 'l' :
                         network_latency = param->value.ui;
                         if (network_latency > NETWORK_MAX_LATENCY) {

windows/JackRouter/JackRouter.cpp

@@ -327,42 +327,51 @@ void JackRouter::shutdownCallback(void* arg)
 }
 
 //------------------------------------------------------------------------------------------
-int JackRouter::processCallback(jack_nframes_t nframes, void* arg)
+void JackRouter::processInputs()
 {
-	JackRouter* driver = (JackRouter*)arg;
-	int i,j;
-	int pos = (driver->fToggle) ? 0 : driver->fBufferSize ;
-
-	for (i = 0; i < driver->fActiveInputs; i++) {
-        if (!driver->fFloatSample) {
-            jack_default_audio_sample_t* buffer = (jack_default_audio_sample_t*)jack_port_get_buffer(driver->fInputPorts[i], nframes);
-            long* in = (long*)driver->fInputBuffers[i] + pos;
-            for (j = 0; j < nframes; j++) {
+    int pos = (fToggle) ? 0 : fBufferSize;
+    
+    for (i = 0; i < fActiveInputs; i++) {
+        if (!fFloatSample) {
+            jack_default_audio_sample_t* buffer = (jack_default_audio_sample_t*)jack_port_get_buffer(fInputPorts[i], fBufferSize);
+            long* in = (long*)fInputBuffers[i] + pos;
+            for (j = 0; j < fBufferSize; j++) {
                 in[j] = buffer[j] * jack_default_audio_sample_t(0x7fffffff);
             }
         } else {
-            memcpy((float*)driver->fInputBuffers[i] + pos,
-                    jack_port_get_buffer(driver->fInputPorts[i], nframes),
-                    nframes * sizeof(jack_default_audio_sample_t));
+            memcpy((float*)fInputBuffers[i] + pos,
+                    jack_port_get_buffer(fInputPorts[i], fBufferSize),
+                    fBufferSize * sizeof(jack_default_audio_sample_t));
         }
 	}
+}
 
-	driver->bufferSwitch();
-
-	for (i = 0; i < driver->fActiveOutputs; i++) {
-        if (!driver->fFloatSample) {
-            jack_default_audio_sample_t* buffer = (jack_default_audio_sample_t*)jack_port_get_buffer(driver->fOutputPorts[i], nframes);
-            long* out = (long*)driver->fOutputBuffers[i] + pos;
+//------------------------------------------------------------------------------------------
+void JackRouter::processOutputs()
+{
+    int pos = (fToggle) ? 0 : fBufferSize;
+    
+    for (i = 0; i < fActiveOutputs; i++) {
+        if (!fFloatSample) {
+            jack_default_audio_sample_t* buffer = (jack_default_audio_sample_t*)jack_port_get_buffer(fOutputPorts[i], fBufferSize);
+            long* out = (long*)fOutputBuffers[i] + pos;
             jack_default_audio_sample_t gain = jack_default_audio_sample_t(1)/jack_default_audio_sample_t(0x7fffffff);
-            for (j = 0; j < nframes; j++) {
+            for (j = 0; j < fBufferSize; j++) {
                 buffer[j] = out[j] * gain;
             }
         } else {
-            memcpy(jack_port_get_buffer(driver->fOutputPorts[i], nframes),
-                    (float*)driver->fOutputBuffers[i] + pos,
-                    nframes * sizeof(jack_default_audio_sample_t));
+            memcpy(jack_port_get_buffer(fOutputPorts[i], fBufferSize),
+                    (float*)fOutputBuffers[i] + pos,
+                    fBufferSize * sizeof(jack_default_audio_sample_t));
         }
 	}
+}
+
+//------------------------------------------------------------------------------------------
+int JackRouter::processCallback(jack_nframes_t nframes, void* arg)
+{
+	JackRouter* driver = (JackRouter*)arg;
+  	driver->bufferSwitch();
 
 	return 0;
 }
@@ -674,8 +683,9 @@ ASIOError JackRouter::createBuffers(ASIOBufferInfo *bufferInfos, long numChannel
 	for (i = 0; i < numChannels; i++, info++) {
 		if (info->isInput) {
             
-			if (info->channelNum < 0 || info->channelNum >= kNumInputs)
+			if (info->channelNum < 0 || info->channelNum >= kNumInputs) {
 				goto error;
+            }
 			fInMap[fActiveInputs] = info->channelNum;
             
             if (!fFloatSample) {
@@ -697,8 +707,9 @@ ASIOError JackRouter::createBuffers(ASIOBufferInfo *bufferInfos, long numChannel
 			_snprintf(buf, sizeof(buf) - 1, "in%d", info->channelNum + 1);
 			fInputPorts[fActiveInputs]
 				= jack_port_register(fClient, buf, JACK_DEFAULT_AUDIO_TYPE, JackPortIsInput,0);
-			if (fInputPorts[fActiveInputs] == NULL)
+			if (fInputPorts[fActiveInputs] == NULL) {
 				goto error;
+            }
 
 			fActiveInputs++;
 			if (fActiveInputs > kNumInputs) {
@@ -708,8 +719,9 @@ error:
 			}
 		} else {	
         
-     		if (info->channelNum < 0 || info->channelNum >= kNumOutputs)
+     		if (info->channelNum < 0 || info->channelNum >= kNumOutputs) {
 				goto error;
+            }
 			fOutMap[fActiveOutputs] = info->channelNum;
 
             if (!fFloatSample) {
@@ -731,8 +743,9 @@ error:
 			_snprintf(buf, sizeof(buf) - 1, "out%d", info->channelNum + 1);
 			fOutputPorts[fActiveOutputs]
 				= jack_port_register(fClient, buf, JACK_DEFAULT_AUDIO_TYPE, JackPortIsOutput,0);
-			if (fOutputPorts[fActiveOutputs] == NULL)
+			if (fOutputPorts[fActiveOutputs] == NULL) {
 				goto error;
+            }
 
 			fActiveOutputs++;
 			if (fActiveOutputs > kNumOutputs) {
@@ -824,9 +837,11 @@ void JackRouter::bufferSwitch()
 {
 	if (fRunning && fCallbacks) {
 		getNanoSeconds(&fTheSystemTime);			// latch system time
+        processInputs();
+        processOutputs();
 		fSamplePosition += fBufferSize;
 		if (fTimeInfoMode) {
-			bufferSwitchX ();
+			bufferSwitchX();
 		} else {
 			fCallbacks->bufferSwitch(fToggle, ASIOFalse);
 		}

windows/JackRouter/JackRouter.h

@@ -164,6 +164,9 @@ private:
 	void autoConnect();
 	void saveConnections();
     void restoreConnections();
+    
+    void processInputs();
+    void processOutputs();
 
 };
 

windows/portaudio/JackPortAudioDevices.cpp

@@ -237,7 +237,7 @@ void PortAudioDevices::DisplayDevicesNames()
         if (Pa_GetHostApiInfo(fDeviceInfo[id]->hostApi)->type == paASIO) {
             long minLatency, maxLatency, preferredLatency, granularity;
 
-            PaAsio_GetAvailableLatencyValues (id, &minLatency, &maxLatency, &preferredLatency, &granularity);
+            PaAsio_GetAvailableBufferSizes (id, &minLatency, &maxLatency, &preferredLatency, &granularity);
 
             jack_info ("ASIO minimum buffer size    = %ld", minLatency);
             jack_info ("ASIO maximum buffer size    = %ld", maxLatency);