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

jack: make mpd_jack_connect() return bool

Browse Source 
Return true/false instead of 1/-1.
This commit is contained in:
Max Kellermann 2009-01-29 23:15:27 +01:00
parent eccc7c21bd
commit 5a2949552b
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/output/jack_plugin.c
View File

@ -55,7 +55,7 @@ struct jack_data {
jack_client_t *client; jack_client_t *client;
jack_ringbuffer_t *ringbuffer[2]; jack_ringbuffer_t *ringbuffer[2];
int bps; int bps;
int shutdown; bool shutdown;
}; };
static const char * static const char *
@ -147,7 +147,7 @@ static void
mpd_jack_shutdown(void *arg) mpd_jack_shutdown(void *arg)
{ {
struct jack_data *jd = (struct jack_data *) arg; struct jack_data *jd = (struct jack_data *) arg;
jd->shutdown = 1; jd->shutdown = true;
} }
static void static void
@ -212,7 +212,7 @@ mpd_jack_test_default_device(void)
return true; return true;
} }
static int static bool
mpd_jack_connect(struct jack_data *jd, struct audio_format *audio_format) mpd_jack_connect(struct jack_data *jd, struct audio_format *audio_format)
{ {
jd->audio_format = audio_format; jd->audio_format = audio_format;
@ -225,7 +225,7 @@ mpd_jack_connect(struct jack_data *jd, struct audio_format *audio_format)
if ((jd->client = jack_client_new(mpd_jack_name(jd))) == NULL) { if ((jd->client = jack_client_new(mpd_jack_name(jd))) == NULL) {
g_warning("jack server not running?"); g_warning("jack server not running?");
return -1; return false;
} }
jack_set_process_callback(jd->client, mpd_jack_process, jd); jack_set_process_callback(jd->client, mpd_jack_process, jd);
@ -239,13 +239,13 @@ mpd_jack_connect(struct jack_data *jd, struct audio_format *audio_format)
if (jd->ports[i] == NULL) { if (jd->ports[i] == NULL) {
g_warning("Cannot register %s output port.", g_warning("Cannot register %s output port.",
port_names[i]); port_names[i]);
return -1; return false;
} }
} }
if ( jack_activate(jd->client) ) { if ( jack_activate(jd->client) ) {
g_warning("cannot activate client"); g_warning("cannot activate client");
return -1; return false;
} }
if (jd->output_ports[1] == NULL) { if (jd->output_ports[1] == NULL) {
@ -257,7 +257,7 @@ mpd_jack_connect(struct jack_data *jd, struct audio_format *audio_format)
JackPortIsPhysical | JackPortIsInput); JackPortIsPhysical | JackPortIsInput);
if (jports == NULL) { if (jports == NULL) {
g_warning("no ports found"); g_warning("no ports found");
return -1; return false;
} }
jd->output_ports[0] = g_strdup(jports[0]); jd->output_ports[0] = g_strdup(jports[0]);
@ -276,11 +276,11 @@ mpd_jack_connect(struct jack_data *jd, struct audio_format *audio_format)
if (ret != 0) { if (ret != 0) {
g_warning("%s is not a valid Jack Client / Port", g_warning("%s is not a valid Jack Client / Port",
jd->output_ports[i]); jd->output_ports[i]);
return -1; return false;
} }
} }
return 1; return true;
} }
static bool static bool
@ -290,7 +290,7 @@ mpd_jack_open(void *data, struct audio_format *audio_format)
assert(jd != NULL); assert(jd != NULL);
if (jd->client == NULL && mpd_jack_connect(jd, audio_format) < 0) { if (jd->client == NULL && !mpd_jack_connect(jd, audio_format)) {
mpd_jack_client_free(jd); mpd_jack_client_free(jd);
return false; return false;
} }