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

output_plugin: replaced output_plugin.get_mixer() with mixer_plugin

Browse Source 
The mixer core library is now responsible for creating and managing
the mixer object.  This removes duplicated code from the output
plugins.
This commit is contained in:
Max Kellermann
2009-03-26 18:23:23 +01:00
parent 209c8a540c
commit 66a2c5669e
9 changed files with 44 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/output_plugin.h
View File

@@ -66,15 +66,6 @@ struct audio_output_plugin {
*/
void (*finish)(void *data);
/**
* Returns the mixer device associated with this audio output.
* This does not actually open the mixer device yet.
*
* @return the mixer object, or NULL if there is no mixer
* attached to this audio output
*/
struct mixer *(*get_mixer)(void *data);
/**
* Really open the device.
*
@@ -125,6 +116,14 @@ struct audio_output_plugin {
* for continue to pause
*/
bool (*pause)(void *data);
/**
* The mixer plugin associated with this output plugin. This
* may be NULL if no mixer plugin is implemented. When
* created, this mixer plugin gets the same #config_param as
* this audio output device.
*/
const struct mixer_plugin *mixer_plugin;
};
static inline bool
@@ -150,14 +149,6 @@ ao_plugin_finish(const struct audio_output_plugin *plugin, void *data)
plugin->finish(data);
}
static inline struct mixer *
ao_plugin_get_mixer(const struct audio_output_plugin *plugin, void *data)
{
return plugin->get_mixer != NULL
? plugin->get_mixer(data)
: NULL;
}
static inline bool
ao_plugin_open(const struct audio_output_plugin *plugin,
void *data, struct audio_format *audio_format,