aboutsummaryrefslogtreecommitdiffstats
path: root/src/output/OutputPlugin.hxx
diff options
context:
space:
mode:
Diffstat (limited to 'src/output/OutputPlugin.hxx')
-rw-r--r--src/output/OutputPlugin.hxx15
1 files changed, 7 insertions, 8 deletions
diff --git a/src/output/OutputPlugin.hxx b/src/output/OutputPlugin.hxx
index 00fa36bc0..2f6869368 100644
--- a/src/output/OutputPlugin.hxx
+++ b/src/output/OutputPlugin.hxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003-2014 The Music Player Daemon Project
+ * Copyright (C) 2003-2015 The Music Player Daemon Project
* http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
@@ -24,7 +24,7 @@
#include <stddef.h>
-struct config_param;
+struct ConfigBlock;
struct AudioFormat;
struct Tag;
struct AudioOutput;
@@ -44,7 +44,7 @@ struct AudioOutputPlugin {
* Test if this plugin can provide a default output, in case
* none has been configured. This method is optional.
*/
- bool (*test_default_device)(void);
+ bool (*test_default_device)();
/**
* Configure and initialize the device, but do not open it
@@ -55,8 +55,7 @@ struct AudioOutputPlugin {
* @return nullptr on error, or an opaque pointer to the plugin's
* data
*/
- AudioOutput *(*init)(const config_param &param,
- Error &error);
+ AudioOutput *(*init)(const ConfigBlock &block, Error &error);
/**
* Free resources allocated by this device.
@@ -107,7 +106,7 @@ struct AudioOutputPlugin {
* Display metadata for the next chunk. Optional method,
* because not all devices can display metadata.
*/
- void (*send_tag)(AudioOutput *data, const Tag *tag);
+ void (*send_tag)(AudioOutput *data, const Tag &tag);
/**
* Play a chunk of audio data.
@@ -162,7 +161,7 @@ ao_plugin_test_default_device(const AudioOutputPlugin *plugin)
gcc_malloc
AudioOutput *
ao_plugin_init(const AudioOutputPlugin *plugin,
- const config_param &param,
+ const ConfigBlock &block,
Error &error);
void
@@ -186,7 +185,7 @@ unsigned
ao_plugin_delay(AudioOutput *ao);
void
-ao_plugin_send_tag(AudioOutput *ao, const Tag *tag);
+ao_plugin_send_tag(AudioOutput *ao, const Tag &tag);
size_t
ao_plugin_play(AudioOutput *ao, const void *chunk, size_t size,