From c3846f29b96e4e5913667fe36efd60c0b9ee73c3 Mon Sep 17 00:00:00 2001 From: kaiv Date: Tue, 29 Oct 2002 19:57:35 +0000 Subject: [PATCH] Changed ALSA driver's port names: alsa_pcm:in_X --> alsa_pcm:capture_X alsa_pcm:out_X --> alsa_pcm:playback_X git-svn-id: svn+ssh://jackaudio.org/trunk/jack@259 0c269be4-1314-0410-8aa9-9f06e86f4224 --- drivers/alsa/alsa_driver.c | 4 ++-- example-clients/cache_killer.c | 4 ++-- example-clients/fltk_client.cc | 4 ++-- example-clients/impulse_grabber.c | 4 ++-- example-clients/monitor_client.c | 8 ++++---- example-clients/simple_client.c | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/alsa/alsa_driver.c b/drivers/alsa/alsa_driver.c index 00ec51a..564517f 100644 --- a/drivers/alsa/alsa_driver.c +++ b/drivers/alsa/alsa_driver.c @@ -1195,7 +1195,7 @@ alsa_driver_attach (alsa_driver_t *driver, jack_engine_t *engine) for (chn = 0; chn < driver->capture_nchannels; chn++) { - snprintf (buf, sizeof(buf) - 1, "in_%lu", chn+1); + snprintf (buf, sizeof(buf) - 1, "capture_%lu", chn+1); if ((port = jack_port_register (driver->client, buf, JACK_DEFAULT_AUDIO_TYPE, port_flags, 0)) == NULL) { jack_error ("ALSA: cannot register port for %s", buf); @@ -1213,7 +1213,7 @@ alsa_driver_attach (alsa_driver_t *driver, jack_engine_t *engine) port_flags = JackPortIsInput|JackPortIsPhysical|JackPortIsTerminal; for (chn = 0; chn < driver->playback_nchannels; chn++) { - snprintf (buf, sizeof(buf) - 1, "out_%lu", chn+1); + snprintf (buf, sizeof(buf) - 1, "playback_%lu", chn+1); if ((port = jack_port_register (driver->client, buf, JACK_DEFAULT_AUDIO_TYPE, port_flags, 0)) == NULL) { jack_error ("ALSA: cannot register port for %s", buf); diff --git a/example-clients/cache_killer.c b/example-clients/cache_killer.c index 683c467..dc00373 100644 --- a/example-clients/cache_killer.c +++ b/example-clients/cache_killer.c @@ -158,11 +158,11 @@ main (int argc, char *argv[]) the client is activated (this may change in the future). */ - if (jack_connect (client, "alsa_pcm:in_1", jack_port_name (input_port))) { + if (jack_connect (client, "alsa_pcm:capture_1", jack_port_name (input_port))) { fprintf (stderr, "cannot connect input ports\n"); } - if (jack_connect (client, jack_port_name (output_port), "alsa_pcm:out_1")) { + if (jack_connect (client, jack_port_name (output_port), "alsa_pcm:playback_1")) { fprintf (stderr, "cannot connect output ports\n"); } diff --git a/example-clients/fltk_client.cc b/example-clients/fltk_client.cc index a34e3b7..462d319 100644 --- a/example-clients/fltk_client.cc +++ b/example-clients/fltk_client.cc @@ -82,11 +82,11 @@ main (int argc, char *argv[]) printf ("client activated\n"); - if (jack_connect (client, "alsa_pcm:in_1", jack_port_name (input_port))) { + if (jack_connect (client, "alsa_pcm:capture_1", jack_port_name (input_port))) { fprintf (stderr, "cannot connect input ports\n"); } - if (jack_connect (client, jack_port_name (output_port), "alsa_pcm:out_1")) { + if (jack_connect (client, jack_port_name (output_port), "alsa_pcm:playback_1")) { fprintf (stderr, "cannot connect output ports\n"); } diff --git a/example-clients/impulse_grabber.c b/example-clients/impulse_grabber.c index 32b1679..1261807 100644 --- a/example-clients/impulse_grabber.c +++ b/example-clients/impulse_grabber.c @@ -168,11 +168,11 @@ main (int argc, char *argv[]) the client is activated (this may change in the future). */ - if (jack_connect (client, "alsa_pcm:in_1", jack_port_name (input_port))) { + if (jack_connect (client, "alsa_pcm:capture_1", jack_port_name (input_port))) { fprintf (stderr, "cannot connect input ports\n"); } - if (jack_connect (client, jack_port_name (output_port), "alsa_pcm:out_1")) { + if (jack_connect (client, jack_port_name (output_port), "alsa_pcm:playback_1")) { fprintf (stderr, "cannot connect output ports\n"); } diff --git a/example-clients/monitor_client.c b/example-clients/monitor_client.c index 9db3ee9..c867e84 100644 --- a/example-clients/monitor_client.c +++ b/example-clients/monitor_client.c @@ -17,12 +17,12 @@ main (int argc, char *argv[]) return 1; } - if (jack_port_request_monitor_by_name (client, "alsa_pcm:in_1", TRUE)) { - fprintf (stderr, "could not enable monitoring for in_1\n"); + if (jack_port_request_monitor_by_name (client, "alsa_pcm:capture_1", TRUE)) { + fprintf (stderr, "could not enable monitoring for capture_1\n"); } sleep (30); - if (jack_port_request_monitor_by_name (client, "alsa_pcm:in_1", FALSE)) { - fprintf (stderr, "could not disable monitoring for in_1\n"); + if (jack_port_request_monitor_by_name (client, "alsa_pcm:capture_1", FALSE)) { + fprintf (stderr, "could not disable monitoring for capture_1\n"); } jack_client_close (client); exit (0); diff --git a/example-clients/simple_client.c b/example-clients/simple_client.c index 2260b84..fe7f985 100644 --- a/example-clients/simple_client.c +++ b/example-clients/simple_client.c @@ -111,11 +111,11 @@ main (int argc, char *argv[]) running. */ - if (jack_connect (client, "alsa_pcm:in_1", jack_port_name (input_port))) { + if (jack_connect (client, "alsa_pcm:capture_1", jack_port_name (input_port))) { fprintf (stderr, "cannot connect input ports\n"); } - if (jack_connect (client, jack_port_name (output_port), "alsa_pcm:out_1")) { + if (jack_connect (client, jack_port_name (output_port), "alsa_pcm:playback_1")) { fprintf (stderr, "cannot connect output ports\n"); }