Correct auto-connect for audioadapter.

common/JackAudioAdapterFactory.cpp

@@ -62,7 +62,7 @@ extern "C"
 
         try {
 
-            adapter = new Jack::JackAudioAdapter(jack_client, new Jack::JackPlatformAdapter(buffer_size, sample_rate, params));
+            adapter = new Jack::JackAudioAdapter(jack_client, new Jack::JackPlatformAdapter(buffer_size, sample_rate, params), params);
             assert(adapter);
 
             if (adapter->Open() == 0) {

common/JackNetAdapter.cpp

@@ -450,7 +450,7 @@ extern "C"
         jack_driver_descriptor_add_parameter(desc, &filler, "ring-buffer", 'g', JackDriverParamInt, &value, NULL, "Fixed ringbuffer size", "Fixed ringbuffer size (if not set => automatic adaptative)");
 
         value.i = false;
-        jack_driver_descriptor_add_parameter(desc, &filler, "auto-connect", 'c', JackDriverParamBool, &value, NULL, "Auto connect netmaster to system ports", "");
+        jack_driver_descriptor_add_parameter(desc, &filler, "auto-connect", 'c', JackDriverParamBool, &value, NULL, "Auto connect netadapter to system ports", NULL);
 
         return desc;
     }

common/JackNetManager.cpp

@@ -568,8 +568,7 @@ namespace Jack
         for (node = params; node; node = jack_slist_next(node)) {
 
             param = (const jack_driver_param_t*) node->data;
-            switch (param->character)
-            {
+            switch (param->character) {
                 case 'a' :
                     if (strlen(param->value.str) < 32) {
                         strcpy(fMulticastIP, param->value.str);

macosx/coreaudio/JackCoreAudioAdapter.cpp

@@ -357,11 +357,7 @@ JackCoreAudioAdapter::JackCoreAudioAdapter(jack_nframes_t buffer_size, jack_nfra
         param = (const jack_driver_param_t*) node->data;
 
         switch (param->character) {
-
-            case 'c' :
-                fCaptureChannels = fPlaybackChannels = param->value.ui;
-                break;
-
+ 
             case 'i':
                 fCaptureChannels = param->value.ui;
                 break;
@@ -1714,7 +1710,6 @@ extern "C"
         desc = jack_driver_descriptor_construct("audioadapter", JackDriverNone, "netjack audio <==> net backend adapter", &filler);
 
         value.i = -1;
-        jack_driver_descriptor_add_parameter(desc, &filler, "channels", 'c', JackDriverParamInt, &value, NULL, "Maximum number of channels", "Maximum number of channels. If -1, max possible number of channels will be used");
         jack_driver_descriptor_add_parameter(desc, &filler, "in-channels", 'i', JackDriverParamInt, &value, NULL, "Maximum number of input channels", "Maximum number of input channels. If -1, max possible number of input channels will be used");
         jack_driver_descriptor_add_parameter(desc, &filler, "out-channels", 'o', JackDriverParamInt, &value, NULL, "Maximum number of output channels", "Maximum number of output channels. If -1, max possible number of output channels will be used");
 
@@ -1728,13 +1723,13 @@ extern "C"
         value.ui = 512U;
         jack_driver_descriptor_add_parameter(desc, &filler, "period", 'p', JackDriverParamUInt, &value, NULL, "Frames per period", NULL);
 
-        value.i = TRUE;
+        value.i = true;
         jack_driver_descriptor_add_parameter(desc, &filler, "duplex", 'D', JackDriverParamBool, &value, NULL, "Provide both capture and playback ports", NULL);
 
         value.str[0] = 0;
         jack_driver_descriptor_add_parameter(desc, &filler, "device", 'd', JackDriverParamString, &value, NULL, "CoreAudio device name", NULL);
 
-        value.i = TRUE;
+        value.i = true;
         jack_driver_descriptor_add_parameter(desc, &filler, "list-devices", 'l', JackDriverParamBool, &value, NULL, "Display available CoreAudio devices", NULL);
 
         value.ui = 0;
@@ -1743,9 +1738,12 @@ extern "C"
         value.ui = 32768;
         jack_driver_descriptor_add_parameter(desc, &filler, "ring-buffer", 'g', JackDriverParamInt, &value, NULL, "Fixed ringbuffer size", "Fixed ringbuffer size (if not set => automatic adaptative)");
 
-        value.i = FALSE;
+        value.i = false;
         jack_driver_descriptor_add_parameter(desc, &filler, "clock-drift", 's', JackDriverParamBool, &value, NULL, "Clock drift compensation", "Whether to compensate clock drift in dynamically created aggregate device");
 
+        value.i = false;
+        jack_driver_descriptor_add_parameter(desc, &filler, "auto-connect", 'c', JackDriverParamBool, &value, NULL, "Auto connect audioadapter to system ports", NULL);
+
         return desc;
     }
 

macosx/coreaudio/JackCoreAudioDriver.cpp

@@ -2491,7 +2491,7 @@ extern "C"
         value.i  = 0;
         jack_driver_descriptor_add_parameter(desc, &filler, "AC3-LFE", 'f', JackDriverParamBool, &value, NULL, "AC3 LFE channel", NULL);
 #endif
-        value.i  = TRUE;
+        value.i  = true;
         jack_driver_descriptor_add_parameter(desc, &filler, "duplex", 'D', JackDriverParamBool, &value, NULL, "Provide both capture and playback ports", NULL);
 
         value.ui  = 44100U;
@@ -2507,10 +2507,10 @@ extern "C"
         jack_driver_descriptor_add_parameter(desc, &filler, "input-latency", 'I', JackDriverParamUInt, &value, NULL, "Extra input latency (frames)", NULL);
         jack_driver_descriptor_add_parameter(desc, &filler, "output-latency", 'O', JackDriverParamUInt, &value, NULL, "Extra output latency (frames)", NULL);
 
-        value.i  = FALSE;
+        value.i  = false;
         jack_driver_descriptor_add_parameter(desc, &filler, "list-devices", 'l', JackDriverParamBool, &value, NULL, "Display available CoreAudio devices", NULL);
 
-        value.i  = FALSE;
+        value.i  = false;
         jack_driver_descriptor_add_parameter(desc, &filler, "hog", 'H', JackDriverParamBool, &value, NULL, "Take exclusive access of the audio device", NULL);
 
         value.ui  = 100;
@@ -2519,7 +2519,7 @@ extern "C"
         value.ui  = 100;
         jack_driver_descriptor_add_parameter(desc, &filler, "grain", 'G', JackDriverParamUInt, &value, NULL, "Computation grain in RT thread (percent)", NULL);
 
-        value.i = FALSE;
+        value.i = false;
         jack_driver_descriptor_add_parameter(desc, &filler, "clock-drift", 's', JackDriverParamBool, &value, NULL, "Clock drift compensation", "Whether to compensate clock drift in dynamically created aggregate device");
 
         return desc;

windows/portaudio/JackPortAudioDriver.cpp

@@ -382,7 +382,7 @@ extern "C"
         value.i = 0;
         jack_driver_descriptor_add_parameter(desc, &filler, "monitor", 'm', JackDriverParamBool, &value, NULL, "Provide monitor ports for the output", NULL);
 
-        value.i = TRUE;
+        value.i = true;
         jack_driver_descriptor_add_parameter(desc, &filler, "duplex", 'D', JackDriverParamBool, &value, NULL, "Provide both capture and playback ports", NULL);
 
         value.ui = 44100U;
@@ -397,7 +397,7 @@ extern "C"
         jack_driver_descriptor_add_parameter(desc, &filler, "input-latency", 'I', JackDriverParamUInt, &value, NULL, "Extra input latency", NULL);
         jack_driver_descriptor_add_parameter(desc, &filler, "output-latency", 'O', JackDriverParamUInt, &value, NULL, "Extra output latency", NULL);
 
-        value.i = TRUE;
+        value.i = true;
         jack_driver_descriptor_add_parameter(desc, &filler, "list-devices", 'l', JackDriverParamBool, &value, NULL, "Display available PortAudio devices", NULL);
 
         return desc;
@@ -456,7 +456,7 @@ extern "C"
                 break;
 
             case 'P':
-                playback = TRUE;
+                playback = true;
                 if (strcmp(param->value.str, "none") != 0) {
                     playback_pcm_name = param->value.str;
                 }