From fd37c06bdb29e7d26cddbcbaccfb0ea0128dfa67 Mon Sep 17 00:00:00 2001 From: torben Date: Thu, 12 Nov 2009 00:56:35 +0000 Subject: [PATCH] joerns commandline parameter sanity patch git-svn-id: svn+ssh://jackaudio.org/trunk/jack@3757 0c269be4-1314-0410-8aa9-9f06e86f4224 --- drivers/netjack/net_driver.c | 43 +++++----- tools/netsource.c | 147 ++++++++++++++++++----------------- 2 files changed, 98 insertions(+), 92 deletions(-) diff --git a/drivers/netjack/net_driver.c b/drivers/netjack/net_driver.c index 529cdac..ff3d39f 100644 --- a/drivers/netjack/net_driver.c +++ b/drivers/netjack/net_driver.c @@ -387,7 +387,7 @@ driver_get_descriptor () params = calloc (desc->nparams, sizeof (jack_driver_param_desc_t)); i = 0; - strcpy (params[i].name, "inchannels"); + strcpy (params[i].name, "audio-ins"); params[i].character = 'i'; params[i].type = JackDriverParamUInt; params[i].value.ui = 2U; @@ -395,7 +395,7 @@ driver_get_descriptor () strcpy (params[i].long_desc, params[i].short_desc); i++; - strcpy (params[i].name, "outchannels"); + strcpy (params[i].name, "audio-outs"); params[i].character = 'o'; params[i].type = JackDriverParamUInt; params[i].value.ui = 2U; @@ -403,7 +403,7 @@ driver_get_descriptor () strcpy (params[i].long_desc, params[i].short_desc); i++; - strcpy (params[i].name, "midi inchannels"); + strcpy (params[i].name, "midi-ins"); params[i].character = 'I'; params[i].type = JackDriverParamUInt; params[i].value.ui = 1U; @@ -411,7 +411,7 @@ driver_get_descriptor () strcpy (params[i].long_desc, params[i].short_desc); i++; - strcpy (params[i].name, "midi outchannels"); + strcpy (params[i].name, "midi-outs"); params[i].character = 'O'; params[i].type = JackDriverParamUInt; params[i].value.ui = 1U; @@ -434,6 +434,15 @@ driver_get_descriptor () strcpy (params[i].short_desc, "Frames per period"); strcpy (params[i].long_desc, params[i].short_desc); + i++; + strcpy (params[i].name, "num-periods"); + params[i].character = 'n'; + params[i].type = JackDriverParamUInt; + params[i].value.ui = 5U; + strcpy (params[i].short_desc, + "Network latency setting in no. of periods"); + strcpy (params[i].long_desc, params[i].short_desc); + i++; strcpy (params[i].name, "listen-port"); params[i].character = 'l'; @@ -449,7 +458,7 @@ driver_get_descriptor () params[i].type = JackDriverParamUInt; params[i].value.ui = 1U; strcpy (params[i].short_desc, - "Factor for sample rate reduction"); + "Factor for sample rate reduction (deprecated)"); strcpy (params[i].long_desc, params[i].short_desc); i++; @@ -458,7 +467,7 @@ driver_get_descriptor () params[i].type = JackDriverParamUInt; params[i].value.ui = 0U; strcpy (params[i].short_desc, - "Factor for sample rate reduction on the upstream"); + "Factor for sample rate reduction on the upstream (deprecated)"); strcpy (params[i].long_desc, params[i].short_desc); i++; @@ -467,7 +476,7 @@ driver_get_descriptor () params[i].type = JackDriverParamUInt; params[i].value.ui = 0U; strcpy (params[i].short_desc, - "sets celt encoding and number of bytes per channel"); + "sets celt encoding and number of bytes per period per channel"); strcpy (params[i].long_desc, params[i].short_desc); i++; @@ -496,16 +505,6 @@ driver_get_descriptor () strcpy (params[i].short_desc, "Whether to use Autoconfig, or just start."); strcpy (params[i].long_desc, params[i].short_desc); - - i++; - strcpy (params[i].name, "latency"); - params[i].character = 'L'; - params[i].type = JackDriverParamUInt; - params[i].value.ui = 5U; - strcpy (params[i].short_desc, - "Latency setting"); - strcpy (params[i].long_desc, params[i].short_desc); - i++; strcpy (params[i].name, "redundancy"); params[i].character = 'R'; @@ -516,12 +515,12 @@ driver_get_descriptor () strcpy (params[i].long_desc, params[i].short_desc); i++; - strcpy (params[i].name, "no-htonl"); - params[i].character = 'H'; + strcpy (params[i].name, "native-endian"); + params[i].character = 'e'; params[i].type = JackDriverParamUInt; params[i].value.ui = 0U; strcpy (params[i].short_desc, - "Dont convert samples to network byte order."); + "Don't convert samples to network byte order."); strcpy (params[i].long_desc, params[i].short_desc); i++; @@ -644,7 +643,7 @@ driver_initialize (jack_client_t *client, const JSList * params) use_autoconfig = param->value.ui; break; - case 'L': + case 'n': latency = param->value.ui; break; @@ -652,7 +651,7 @@ driver_initialize (jack_client_t *client, const JSList * params) redundancy = param->value.ui; break; - case 'H': + case 'e': dont_htonl_floats = param->value.ui; break; case 'J': diff --git a/tools/netsource.c b/tools/netsource.c index d9f3474..25fde61 100644 --- a/tools/netsource.c +++ b/tools/netsource.c @@ -520,23 +520,25 @@ fflush( stdout ); void printUsage () { -fprintf (stderr, "usage: jack_netsource -h [options]\n" +fprintf (stderr, "usage: jack_netsource [options]\n" "\n" - " -n - Reports a different name to jack\n" - " -s - The name of the local jack server\n" - " -h - Host name of the slave JACK\n" - " -p - UDP port used by the slave JACK\n" - " -P - Number of audio playback channels\n" - " -C - Number of audio capture channels\n" - " -o - Number of midi playback channels\n" - " -i - Number of midi capture channels\n" - " -l - Network latency in number of NetJack frames\n" - " -r - Local UDP port to use\n" - " -f - Downsample data in the wire by this factor\n" + " -h this help text\n" + " -H - Host name of the slave JACK\n" + " -o - Number of audio playback channels\n" + " -i - Number of audio capture channels\n" + " -O - Number of midi playback channels\n" + " -I - Number of midi capture channels\n" + " -n - Network latency in JACK periods\n" + " -p - UDP port that the slave is listening on\n" + " -r - UDP port that we are listening on\n" + " -B - reply port, for use in NAT environments\n" " -b - Set transport to use 16bit or 8bit\n" + " -c - Use CELT encoding with per period and channel\n" " -m - Assume this mtu for the link\n" - " -c - Use Celt and encode per channel and packet.\n" - " -R - Send out packets N times.\n" + " -R - Redundancy: send out packets N times.\n" + " -e - skip host-to-network endianness conversion\n" + " -N - Reports a different name to jack\n" + " -s - The name of the local jack server\n" "\n"); } @@ -578,80 +580,85 @@ main (int argc, char *argv[]) sprintf(client_name, "netsource"); sprintf(peer_ip, "localhost"); - while ((c = getopt (argc, argv, ":H:R:n:s:h:p:C:P:i:o:l:r:f:b:m:c:B:")) != -1) + while ((c = getopt (argc, argv, ":h:H:o:i:O:I:n:p:r:B:b:c:m:R:e:N:s:")) != -1) { switch (c) { - case 'n': - free(client_name); - client_name = (char *) malloc (sizeof (char) * strlen (optarg)+1); - strcpy (client_name, optarg); - break; - case 's': - server_name = (char *) malloc (sizeof (char) * strlen (optarg)+1); - strcpy (server_name, optarg); - options |= JackServerName; - break; case 'h': - free(peer_ip); - peer_ip = (char *) malloc (sizeof (char) * strlen (optarg)+1); - strcpy (peer_ip, optarg); - break; - case 'p': - peer_port = atoi (optarg); - break; - case 'P': - playback_channels_audio = atoi (optarg); - break; - case 'C': - capture_channels_audio = atoi (optarg); - break; + printUsage(); + exit (0); + break; + case 'H': + free(peer_ip); + peer_ip = (char *) malloc (sizeof (char) * strlen (optarg)+1); + strcpy (peer_ip, optarg); + break; case 'o': - playback_channels_midi = atoi (optarg); - break; + playback_channels_audio = atoi (optarg); + break; case 'i': - capture_channels_midi = atoi (optarg); - break; - case 'l': - latency = atoi (optarg); - break; + capture_channels_audio = atoi (optarg); + break; + case 'O': + playback_channels_midi = atoi (optarg); + break; + case 'I': + capture_channels_midi = atoi (optarg); + break; + case 'n': + latency = atoi (optarg); + break; + case 'p': + peer_port = atoi (optarg); + break; case 'r': - reply_port = atoi (optarg); - break; + reply_port = atoi (optarg); + break; case 'B': - bind_port = atoi (optarg); - break; + bind_port = atoi (optarg); + break; case 'f': - factor = atoi (optarg); - break; + factor = atoi (optarg); + jack_info("This feature is deprecated and will be removed in future netjack versions. CELT offers a superiour way to conserve bandwidth"); + break; case 'b': - bitdepth = atoi (optarg); - break; + bitdepth = atoi (optarg); + break; case 'c': #if HAVE_CELT - bitdepth = 1000; - factor = atoi (optarg); + bitdepth = 1000; + factor = atoi (optarg); #else - printf( "not built with celt supprt\n" ); - exit(10); + printf( "not built with celt supprt\n" ); + exit(10); #endif - break; + break; case 'm': - mtu = atoi (optarg); - break; + mtu = atoi (optarg); + break; case 'R': - redundancy = atoi (optarg); - break; - case 'H': - dont_htonl_floats = atoi (optarg); - break; + redundancy = atoi (optarg); + break; + case 'e': + dont_htonl_floats = 1; + break; + case 'N': + free(client_name); + client_name = (char *) malloc (sizeof (char) * strlen (optarg)+1); + strcpy (client_name, optarg); + break; + case 's': + server_name = (char *) malloc (sizeof (char) * strlen (optarg)+1); + strcpy (server_name, optarg); + options |= JackServerName; + break; case ':': - fprintf (stderr, "Option -%c requires an operand\n", optopt); - errflg++; - break; + fprintf (stderr, "Option -%c requires an operand\n", optopt); + errflg++; + break; case '?': - fprintf (stderr, "Unrecognized option: -%c\n", optopt); - errflg++; + fprintf (stderr, "Unrecognized option: -%c\n", optopt); + errflg++; } } if (errflg)