summaryrefslogtreecommitdiffstats
path: root/audio/out/ao_jack.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-08-22 23:12:35 +0200
committerwm4 <wm4@nowhere>2013-08-22 23:12:35 +0200
commitedd36a3afce4ca3778461e61df64f6a79ba94079 (patch)
treea7916172632fea425b9c3a58e673573203850266 /audio/out/ao_jack.c
parentcb54c2dda8be8a79e8bc6c658b4815c55bdfc14e (diff)
downloadmpv-edd36a3afce4ca3778461e61df64f6a79ba94079.tar.bz2
mpv-edd36a3afce4ca3778461e61df64f6a79ba94079.tar.xz
audio/out: do some mp_msg conversions
Use the new MP_ macros for some AOs instead of mp_msg. Not all AOs are converted, and some only partially. In some cases, some additional cosmetic changes are made.
Diffstat (limited to 'audio/out/ao_jack.c')
-rw-r--r--audio/out/ao_jack.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/audio/out/ao_jack.c b/audio/out/ao_jack.c
index 579dee2631..b1f105248f 100644
--- a/audio/out/ao_jack.c
+++ b/audio/out/ao_jack.c
@@ -190,7 +190,7 @@ static int init(struct ao *ao)
open_options |= JackNoStartServer;
p->client = jack_client_open(p->cfg_client_name, open_options, NULL);
if (!p->client) {
- mp_msg(MSGT_AO, MSGL_FATAL, "[JACK] cannot open server\n");
+ MP_FATAL(ao, "cannot open server\n");
goto err_out;
}
jack_set_process_callback(p->client, outputaudio, ao);
@@ -201,7 +201,7 @@ static int init(struct ao *ao)
port_flags |= JackPortIsPhysical;
matching_ports = jack_get_ports(p->client, port_name, NULL, port_flags);
if (!matching_ports || !matching_ports[0]) {
- mp_msg(MSGT_AO, MSGL_FATAL, "[JACK] no physical ports available\n");
+ MP_FATAL(ao, "no physical ports available\n");
goto err_out;
}
i = 1;
@@ -220,19 +220,19 @@ static int init(struct ao *ao)
jack_port_register(p->client, pname, JACK_DEFAULT_AUDIO_TYPE,
JackPortIsOutput, 0);
if (!p->ports[i]) {
- mp_msg(MSGT_AO, MSGL_FATAL, "[JACK] not enough ports available\n");
+ MP_FATAL(ao, "not enough ports available\n");
goto err_out;
}
}
if (jack_activate(p->client)) {
- mp_msg(MSGT_AO, MSGL_FATAL, "[JACK] activate failed\n");
+ MP_FATAL(ao, "activate failed\n");
goto err_out;
}
for (i = 0; i < p->num_ports; i++) {
if (jack_connect(p->client, jack_port_name(p->ports[i]),
matching_ports[i]))
{
- mp_msg(MSGT_AO, MSGL_FATAL, "[JACK] connecting failed\n");
+ MP_FATAL(ao, "connecting failed\n");
goto err_out;
}
}