diff options
| author | 7890 <tom@trellis.ch> | 2019-01-16 01:31:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-16 01:31:25 +0100 |
| commit | 681cb1c751a43b5ca02f1d6a7a5b5264df32001f (patch) | |
| tree | fabcfa340cbc133d3ca4062bde9b603b8f674234 | |
| parent | 052a64c8d9fa202c41cbbc9518059dde4a140c5a (diff) | |
| parent | 40a689dbb8130d0bc3faf972e55507172192d4de (diff) | |
| download | jack2-681cb1c751a43b5ca02f1d6a7a5b5264df32001f.tar.gz | |
Merge pull request #265 from fjapinteric/master
alsa_in.c alsa_out.c (add option -S)
| -rw-r--r-- | example-clients/alsa_in.c | 11 | ||||
| -rw-r--r-- | example-clients/alsa_out.c | 10 |
2 files changed, 17 insertions, 4 deletions
diff --git a/example-clients/alsa_in.c b/example-clients/alsa_in.c index 8836b12d..dc89fc99 100644 --- a/example-clients/alsa_in.c +++ b/example-clients/alsa_in.c @@ -599,6 +599,7 @@ void printUsage() { fprintf(stderr, "usage: alsa_out [options]\n" "\n" " -j <jack name> - client name\n" + " -S <server name> - server to connect\n" " -d <alsa_device> \n" " -c <channels> \n" " -p <period_size> \n" @@ -627,13 +628,15 @@ sigterm_handler( int signal ) int main (int argc, char *argv[]) { char jack_name[30] = "alsa_in"; char alsa_device[30] = "hw:0"; + char *server_name = NULL; + int jack_opts = 0; extern char *optarg; extern int optind, optopt; int errflg=0; int c; - while ((c = getopt(argc, argv, "ivj:r:c:p:n:d:q:m:t:f:F:C:Q:s:")) != -1) { + while ((c = getopt(argc, argv, "ivj:r:c:p:n:d:q:m:t:f:F:C:Q:s:S:")) != -1) { switch(c) { case 'j': strcpy(jack_name,optarg); @@ -683,6 +686,10 @@ int main (int argc, char *argv[]) { case 's': smooth_size = atoi(optarg); break; + case 'S': + server_name = optarg; + jack_opts |= JackServerName; + break; case ':': fprintf(stderr, "Option -%c requires an operand\n", optopt); @@ -703,7 +710,7 @@ int main (int argc, char *argv[]) { fprintf (stderr, "invalid samplerate quality\n"); return 1; } - if ((client = jack_client_open (jack_name, 0, NULL)) == 0) { + if ((client = jack_client_open (jack_name, jack_opts, NULL, server_name)) == 0) { fprintf (stderr, "jack server not running?\n"); return 1; } diff --git a/example-clients/alsa_out.c b/example-clients/alsa_out.c index d45a42b6..7ad64e4e 100644 --- a/example-clients/alsa_out.c +++ b/example-clients/alsa_out.c @@ -631,13 +631,15 @@ sigterm_handler( int signal ) int main (int argc, char *argv[]) { char jack_name[30] = "alsa_out"; char alsa_device[30] = "hw:0"; + int jack_opts = 0; + char *server_name = NULL; extern char *optarg; extern int optind, optopt; int errflg=0; int c; - while ((c = getopt(argc, argv, "ivj:r:c:p:n:d:q:m:t:f:F:C:Q:s:")) != -1) { + while ((c = getopt(argc, argv, "ivj:r:c:p:n:d:q:m:t:f:F:C:Q:s:S:")) != -1) { switch(c) { case 'j': strcpy(jack_name,optarg); @@ -687,6 +689,10 @@ int main (int argc, char *argv[]) { case 's': smooth_size = atoi(optarg); break; + case 'S': + server_name = optarg; + jack_opts |= JackServerName; + break; case ':': fprintf(stderr, "Option -%c requires an operand\n", optopt); @@ -707,7 +713,7 @@ int main (int argc, char *argv[]) { fprintf (stderr, "invalid samplerate quality\n"); return 1; } - if ((client = jack_client_open (jack_name, 0, NULL)) == 0) { + if ((client = jack_client_open (jack_name, jack_opts, NULL, server_name)) == 0) { fprintf (stderr, "jack server not running?\n"); return 1; } |