aboutsummaryrefslogtreecommitdiffstats
path: root/src/output/jack_plugin.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-02-25 17:32:58 +0100
committerMax Kellermann <max@duempel.org>2009-02-25 17:32:58 +0100
commit0cf4f09e4ffb4866eba5c4055fabfe1e60c780e4 (patch)
treebffb8f2c37f494233428bf51b5b8e98e23144c98 /src/output/jack_plugin.c
parent4726c7f709af4d0998b042fa74e1860953898458 (diff)
downloadmpd-0cf4f09e4ffb4866eba5c4055fabfe1e60c780e4.tar.gz
mpd-0cf4f09e4ffb4866eba5c4055fabfe1e60c780e4.tar.xz
mpd-0cf4f09e4ffb4866eba5c4055fabfe1e60c780e4.zip
output_api: removed audio_output_get_name()
Use config_get_block_string("name") instead of audio_output_get_name().
Diffstat (limited to 'src/output/jack_plugin.c')
-rw-r--r--src/output/jack_plugin.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/src/output/jack_plugin.c b/src/output/jack_plugin.c
index fa5354feb..7ce041009 100644
--- a/src/output/jack_plugin.c
+++ b/src/output/jack_plugin.c
@@ -41,7 +41,7 @@ static const char *const port_names[2] = {
};
struct jack_data {
- struct audio_output *ao;
+ const char *name;
/* configuration */
char *output_ports[2];
@@ -58,12 +58,6 @@ struct jack_data {
bool shutdown;
};
-static const char *
-mpd_jack_name(const struct jack_data *jd)
-{
- return audio_output_get_name(jd->ao);
-}
-
static void
mpd_jack_client_free(struct jack_data *jd)
{
@@ -163,7 +157,7 @@ mpd_jack_info(const char *msg)
#endif
static void *
-mpd_jack_init(struct audio_output *ao,
+mpd_jack_init(G_GNUC_UNUSED struct audio_output *ao,
G_GNUC_UNUSED const struct audio_format *audio_format,
const struct config_param *param)
{
@@ -171,7 +165,7 @@ mpd_jack_init(struct audio_output *ao,
const char *value;
jd = g_new(struct jack_data, 1);
- jd->ao = ao;
+ jd->name = config_get_block_string(param, "name", "mpd_jack");
g_debug("mpd_jack_init (pid=%d)", getpid());
@@ -221,7 +215,7 @@ mpd_jack_connect(struct jack_data *jd)
jd->shutdown = false;
- if ((jd->client = jack_client_new(mpd_jack_name(jd))) == NULL) {
+ if ((jd->client = jack_client_new(jd->name)) == NULL) {
g_warning("jack server not running?");
return false;
}