oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

jack: use loops for allocating/freeing ports/buffers

Browse Source 
Preparation for supporting other channel numbers than stereo: use
loops instead of duplicating code for the second channel.  Most
likely, gcc will unroll these loops, so the binary won't be any
different.
This commit is contained in:
Max Kellermann
2009-01-29 23:14:04 +01:00
parent 3baeddbcae
commit eccc7c21bd
1 changed files with 32 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/output/jack_plugin.c
View File

@@ -36,6 +36,10 @@
static const size_t sample_size = sizeof(jack_default_audio_sample_t); static const size_t sample_size = sizeof(jack_default_audio_sample_t);
static const char *const port_names[2] = {
"left", "right",
};
struct jack_data { struct jack_data {
struct audio_output *ao; struct audio_output *ao;
@@ -71,14 +75,11 @@ mpd_jack_client_free(struct jack_data *jd)
jd->client = NULL; jd->client = NULL;
} }
if (jd->ringbuffer[0] != NULL) { for (unsigned i = 0; i < G_N_ELEMENTS(jd->ringbuffer); ++i) {
jack_ringbuffer_free(jd->ringbuffer[0]); if (jd->ringbuffer[i] != NULL) {
jd->ringbuffer[0] = NULL; jack_ringbuffer_free(jd->ringbuffer[i]);
} jd->ringbuffer[i] = NULL;
}
if (jd->ringbuffer[1] != NULL) {
jack_ringbuffer_free(jd->ringbuffer[1]);
jd->ringbuffer[1] = NULL;
} }
} }
@@ -123,7 +124,7 @@ mpd_jack_process(jack_nframes_t nframes, void *arg)
if (nframes <= 0) if (nframes <= 0)
return 0; return 0;
for (unsigned i = 0; i < 2; ++i) { for (unsigned i = 0; i < G_N_ELEMENTS(jd->ringbuffer); ++i) {
available = jack_ringbuffer_read_space(jd->ringbuffer[i]); available = jack_ringbuffer_read_space(jd->ringbuffer[i]);
assert(available % sample_size == 0); assert(available % sample_size == 0);
available /= sample_size; available /= sample_size;
@@ -216,8 +217,9 @@ mpd_jack_connect(struct jack_data *jd, struct audio_format *audio_format)
{ {
jd->audio_format = audio_format; jd->audio_format = audio_format;
jd->ringbuffer[0] = jack_ringbuffer_create(jd->ringbuffer_size); for (unsigned i = 0; i < G_N_ELEMENTS(jd->ringbuffer); ++i)
jd->ringbuffer[1] = jack_ringbuffer_create(jd->ringbuffer_size); jd->ringbuffer[i] =
jack_ringbuffer_create(jd->ringbuffer_size);
jd->shutdown = false; jd->shutdown = false;
@@ -230,20 +232,15 @@ mpd_jack_connect(struct jack_data *jd, struct audio_format *audio_format)
jack_set_sample_rate_callback(jd->client, mpd_jack_srate, jd); jack_set_sample_rate_callback(jd->client, mpd_jack_srate, jd);
jack_on_shutdown(jd->client, mpd_jack_shutdown, jd); jack_on_shutdown(jd->client, mpd_jack_shutdown, jd);
jd->ports[0] = jack_port_register(jd->client, "left", for (unsigned i = 0; i < G_N_ELEMENTS(jd->ports); ++i) {
JACK_DEFAULT_AUDIO_TYPE, jd->ports[i] = jack_port_register(jd->client, port_names[i],
JackPortIsOutput, 0); JACK_DEFAULT_AUDIO_TYPE,
if ( !jd->ports[0] ) { JackPortIsOutput, 0);
g_warning("Cannot register left output port."); if (jd->ports[i] == NULL) {
return -1; g_warning("Cannot register %s output port.",
} port_names[i]);
return -1;
jd->ports[1] = jack_port_register(jd->client, "right", }
JACK_DEFAULT_AUDIO_TYPE,
JackPortIsOutput, 0);
if ( !jd->ports[1] ) {
g_warning("Cannot register right output port.");
return -1;
} }
if ( jack_activate(jd->client) ) { if ( jack_activate(jd->client) ) {
@@ -271,17 +268,16 @@ mpd_jack_connect(struct jack_data *jd, struct audio_format *audio_format)
free(jports); free(jports);
} }
if ( (jack_connect(jd->client, jack_port_name(jd->ports[0]), for (unsigned i = 0; i < G_N_ELEMENTS(jd->ports); ++i) {
jd->output_ports[0])) != 0 ) { int ret;
g_warning("%s is not a valid Jack Client / Port",
jd->output_ports[0]); ret = jack_connect(jd->client, jack_port_name(jd->ports[i]),
return -1; jd->output_ports[i]);
} if (ret != 0) {
if ( (jack_connect(jd->client, jack_port_name(jd->ports[0]), g_warning("%s is not a valid Jack Client / Port",
jd->output_ports[1])) != 0 ) { jd->output_ports[i]);
g_warning("%s is not a valid Jack Client / Port", return -1;
jd->output_ports[1]); }
return -1;
} }
return 1; return 1;