-X now allows to add several slave backends, add -I to load several internal clients.

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

ChangeLog

@@ -37,7 +37,8 @@ Valerio Pilo
 2011-03-11 Stephane Letz  <letz@grame.fr>
 
 	* Correct JackNetMaster::SetBufferSize.
-	* Use jack_default_audio_sample_t instead of float consistently.
+	* Use jack_default_audio_sample_t instead of float consistently, fix ticket #201."
+	* -X now allows to add several slave backends, add -I to load several internal clients.
 
 2011-03-10 Stephane Letz  <letz@grame.fr>
 

common/Jackdmp.cpp

@@ -26,6 +26,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include <getopt.h>
 #include <cstring>
 #include <cstdio>
+#include <list>
 
 #include "types.h"
 #include "jack.h"
@@ -101,7 +102,8 @@ static void usage(FILE* file)
             "               [ --timeout OR -t client-timeout-in-msecs ]\n"
             "               [ --loopback OR -L loopback-port-number ]\n"
             "               [ --port-max OR -p maximum-number-of-ports]\n"
-            "               [ --midi OR -X midi-driver ]\n"
+            "               [ --slave-backend OR -X slave-backend-name ]\n"
+            "               [ --internal-client OR -I internal-client-name ]\n"
             "               [ --verbose OR -v ]\n"
 #ifdef __linux__
             "               [ --clocksource OR -c [ c(ycle) | h(pet) | s(ystem) ]\n"
@@ -111,21 +113,21 @@ static void usage(FILE* file)
             "               [ --sync OR -S ]\n"
             "               [ --temporary OR -T ]\n"
             "               [ --version OR -V ]\n"
-            "         -d backend [ ... backend args ... ]\n"
+            "         -d master-backend-name [ ... master-backend args ... ]\n"
 #ifdef __APPLE__
-            "               Available backends may include: coreaudio, dummy or net.\n\n"
+            "               Available master backends may include: coreaudio, dummy or net.\n\n"
 #endif
 #ifdef WIN32
-            "               Available backends may include: portaudio, dummy or net.\n\n"
+            "               Available master backends may include: portaudio, dummy or net.\n\n"
 #endif
 #ifdef __linux__
-            "               Available backends may include: alsa, dummy, freebob, firewire or net\n\n"
+            "               Available master backends may include: alsa, dummy, freebob, firewire or net\n\n"
 #endif
 #if defined(__sun__) || defined(sun)
-            "               Available backends may include: boomer, oss, dummy or net.\n\n"
+            "               Available master backends may include: boomer, oss, dummy or net.\n\n"
 #endif
-            "       jackdmp -d backend --help\n"
-            "             to display options for each backend\n\n");
+            "       jackdmp -d master-backend-name --help\n"
+            "             to display options for each master backend\n\n");
 }
 
 // To put in the control.h interface??
@@ -151,6 +153,20 @@ jackctl_server_get_driver(
     return NULL;
 }
 
+static jackctl_internal_t * jackctl_server_get_internal(jackctl_server_t *server, const char *internal_name)
+{
+    const JSList * node_ptr = jackctl_server_get_internals_list(server);
+
+    while (node_ptr) {
+        if (strcmp(jackctl_internal_get_name((jackctl_internal_t *)node_ptr->data), internal_name) == 0) {
+            return (jackctl_internal_t *)node_ptr->data;
+        }
+        node_ptr = jack_slist_next(node_ptr);
+    }
+
+    return NULL;
+}
+
 static jackctl_parameter_t *
 jackctl_get_parameter(
     const JSList * parameters_list,
@@ -174,12 +190,11 @@ int main(int argc, char* argv[])
     jackctl_server_t * server_ctl;
     const JSList * server_parameters;
     const char* server_name = "default";
-    jackctl_driver_t * audio_driver_ctl;
-    jackctl_driver_t * midi_driver_ctl;
+    jackctl_driver_t * master_driver_ctl;
     jackctl_driver_t * loopback_driver_ctl;
     int replace_registry = 0;
 
-    const char *options = "-d:X:P:uvshVrRL:STFl:t:mn:p:"
+    const char *options = "-d:X:I:P:uvshVrRL:STFl:t:mn:p:"
 #ifdef __linux__
         "c:"
 #endif
@@ -192,6 +207,7 @@ int main(int argc, char* argv[])
                                        { "loopback-driver", 1, 0, 'L' },
                                        { "audio-driver", 1, 0, 'd' },
                                        { "midi-driver", 1, 0, 'X' },
+                                       { "internal-client", 1, 0, 'I' },
                                        { "verbose", 0, 0, 'v' },
                                        { "help", 0, 0, 'h' },
                                        { "port-max", 1, 0, 'p' },
@@ -213,14 +229,9 @@ int main(int argc, char* argv[])
 
     int i,opt = 0;
     int option_index = 0;
-    bool seen_audio_driver = false;
-    bool seen_midi_driver = false;
-    char *audio_driver_name = NULL;
-    char **audio_driver_args = NULL;
-    int audio_driver_nargs = 1;
-    char *midi_driver_name = NULL;
-    char **midi_driver_args = NULL;
-    int midi_driver_nargs = 1;
+    char *master_driver_name = NULL;
+    char **master_driver_args = NULL;
+    int master_driver_nargs = 1;
     int do_mlock = 1;
     int do_unlock = 0;
     int loopback = 0;
@@ -229,6 +240,10 @@ int main(int argc, char* argv[])
     jackctl_parameter_t* param;
     union jackctl_parameter_value value;
 
+    std::list<char*> internals_list;
+    std::list<char*> slaves_list;
+    std::list<char*>::iterator it;
+
     copyright(stdout);
 #if defined(JACK_DBUS) && defined(__linux__)
     server_ctl = jackctl_server_create(audio_acquire, audio_release);
@@ -250,7 +265,7 @@ int main(int argc, char* argv[])
     }
 
     opterr = 0;
-    while (!seen_audio_driver &&
+    while (!master_driver_name &&
             (opt = getopt_long(argc, argv, options,
                                long_options, &option_index)) != EOF) {
         switch (opt) {
@@ -277,8 +292,7 @@ int main(int argc, char* argv[])
         #endif
 
             case 'd':
-                seen_audio_driver = true;
-                audio_driver_name = optarg;
+                master_driver_name = optarg;
                 break;
 
             case 'L':
@@ -286,8 +300,11 @@ int main(int argc, char* argv[])
                 break;
 
             case 'X':
-                seen_midi_driver = true;
-                midi_driver_name = optarg;
+                slaves_list.push_back(optarg);
+                break;
+
+            case 'I':
+                internals_list.push_back(optarg);
                 break;
 
             case 'p':
@@ -404,59 +421,57 @@ int main(int argc, char* argv[])
         return -1;
     }
 
-    if (!seen_audio_driver) {
+    if (!master_driver_name) {
         usage(stderr);
         goto fail_free1;
     }
 
     // Audio driver
-    audio_driver_ctl = jackctl_server_get_driver(server_ctl, audio_driver_name);
-    if (audio_driver_ctl == NULL) {
-        fprintf(stderr, "Unknown driver \"%s\"\n", audio_driver_name);
+    master_driver_ctl = jackctl_server_get_driver(server_ctl, master_driver_name);
+    if (master_driver_ctl == NULL) {
+        fprintf(stderr, "Unknown driver \"%s\"\n", master_driver_name);
         goto fail_free1;
     }
 
     if (optind < argc) {
-        audio_driver_nargs = 1 + argc - optind;
+        master_driver_nargs = 1 + argc - optind;
     } else {
-        audio_driver_nargs = 1;
+        master_driver_nargs = 1;
     }
 
-    if (audio_driver_nargs == 0) {
+    if (master_driver_nargs == 0) {
         fprintf(stderr, "No driver specified ... hmm. JACK won't do"
                 " anything when run like this.\n");
         goto fail_free1;
     }
 
-    audio_driver_args = (char **) malloc(sizeof(char *) * audio_driver_nargs);
-    audio_driver_args[0] = audio_driver_name;
+    master_driver_args = (char **) malloc(sizeof(char *) * master_driver_nargs);
+    master_driver_args[0] = master_driver_name;
 
-    for (i = 1; i < audio_driver_nargs; i++) {
-        audio_driver_args[i] = argv[optind++];
+    for (i = 1; i < master_driver_nargs; i++) {
+        master_driver_args[i] = argv[optind++];
     }
 
-    if (jackctl_parse_driver_params(audio_driver_ctl, audio_driver_nargs, audio_driver_args)) {
+    if (jackctl_parse_driver_params(master_driver_ctl, master_driver_nargs, master_driver_args)) {
         goto fail_free1;
     }
 
     // Setup signals then start server
     signals = jackctl_setup_signals(0);
 
-    if (!jackctl_server_start(server_ctl, audio_driver_ctl)) {
+    if (!jackctl_server_start(server_ctl, master_driver_ctl)) {
         fprintf(stderr, "Failed to start server\n");
         goto fail_free1;
     }
 
-    // MIDI driver
-    if (seen_midi_driver) {
-
-        midi_driver_ctl = jackctl_server_get_driver(server_ctl, midi_driver_name);
-        if (midi_driver_ctl == NULL) {
-            fprintf(stderr, "Unknown driver \"%s\"\n", midi_driver_name);
+    // Slave driver
+    for (it = slaves_list.begin(); it != slaves_list.end(); it++) {
+        jackctl_driver_t * slave_driver_ctl = jackctl_server_get_driver(server_ctl, *it);
+        if (slave_driver_ctl == NULL) {
+            fprintf(stderr, "Unknown driver \"%s\"\n", *it);
             goto fail_free2;
         }
-
-        jackctl_server_add_slave(server_ctl, midi_driver_ctl);
+        jackctl_server_add_slave(server_ctl, slave_driver_ctl);
     }
 
     // Loopback driver
@@ -473,6 +488,16 @@ int main(int argc, char* argv[])
         }
     }
 
+    // Load internal clients
+    for (it = internals_list.begin(); it != internals_list.end(); it++) {
+        jackctl_internal_t * internal_driver_ctl = jackctl_server_get_internal(server_ctl, *it);
+        if (internal_driver_ctl == NULL) {
+            fprintf(stderr, "Unknown internal \"%s\"\n", *it);
+            goto fail_free2;
+        }
+        jackctl_server_load_internal(server_ctl, internal_driver_ctl);
+    }
+
     notify_server_start(server_name);
 
     // Waits for signal

windows/JackWinProcessSync.cpp

@@ -1,20 +1,20 @@
 /*
  Copyright (C) 2004-2008 Grame
- 
+
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU Lesser General Public License as published by
  the Free Software Foundation; either version 2.1 of the License, or
  (at your option) any later version.
- 
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  GNU Lesser General Public License for more details.
- 
+
  You should have received a copy of the GNU Lesser General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- 
+
  */
 
 
@@ -74,7 +74,7 @@ bool JackWinProcessSync::LockedTimedWait(long usec)
 }
 
 /*
-Code from CAGuard.cpp : does ot sees to work as expected..
+Code from APPLE CAGuard.cpp : does not seem to work as expected...
 
 void JackWinProcessSync::Wait()
 {