Commit 0bd0e2a3 authored by Max Kellermann's avatar Max Kellermann

output: rename plugin variables

Consistent naming.
parent 47774ce8
......@@ -669,7 +669,7 @@ alsa_play(void *data, const void *chunk, size_t size, GError **error)
}
}
const struct audio_output_plugin alsaPlugin = {
const struct audio_output_plugin alsa_output_plugin = {
.name = "alsa",
.test_default_device = alsa_test_default_device,
.init = alsa_init,
......
......@@ -20,6 +20,6 @@
#ifndef MPD_ALSA_OUTPUT_PLUGIN_H
#define MPD_ALSA_OUTPUT_PLUGIN_H
extern const struct audio_output_plugin alsaPlugin;
extern const struct audio_output_plugin alsa_output_plugin;
#endif
......@@ -418,7 +418,7 @@ osx_output_play(void *data, const void *chunk, size_t size,
return nbytes;
}
const struct audio_output_plugin osxPlugin = {
const struct audio_output_plugin osx_output_plugin = {
.name = "osx",
.test_default_device = osx_output_test_default_device,
.init = osx_output_init,
......
......@@ -1031,7 +1031,7 @@ raop_output_play(void *data, const void *chunk, size_t size,
return rval;
}
const struct audio_output_plugin raopPlugin = {
const struct audio_output_plugin raop_output_plugin = {
.name = "raop",
.init = raop_output_init,
.finish = raop_output_finish,
......
......@@ -26,7 +26,7 @@
struct raop_data;
extern const struct audio_output_plugin raopPlugin;
extern const struct audio_output_plugin raop_output_plugin;
bool
raop_set_volume(struct raop_data *rd, unsigned volume, GError **error_r);
......
......@@ -551,7 +551,7 @@ static void my_shout_set_tag(void *data,
write_page(sd, NULL);
}
const struct audio_output_plugin shoutPlugin = {
const struct audio_output_plugin shout_output_plugin = {
.name = "shout",
.init = my_shout_init_driver,
.finish = my_shout_finish_driver,
......
......@@ -20,6 +20,6 @@
#ifndef MPD_SHOUT_OUTPUT_PLUGIN_H
#define MPD_SHOUT_OUTPUT_PLUGIN_H
extern const struct audio_output_plugin shoutPlugin;
extern const struct audio_output_plugin shout_output_plugin;
#endif
......@@ -42,7 +42,7 @@
const struct audio_output_plugin *audio_output_plugins[] = {
#ifdef HAVE_SHOUT
&shoutPlugin,
&shout_output_plugin,
#endif
&null_output_plugin,
#ifdef HAVE_FIFO
......@@ -52,7 +52,7 @@ const struct audio_output_plugin *audio_output_plugins[] = {
&pipe_output_plugin,
#endif
#ifdef HAVE_ALSA
&alsaPlugin,
&alsa_output_plugin,
#endif
#ifdef HAVE_ROAR
&roar_output_plugin,
......@@ -67,10 +67,10 @@ const struct audio_output_plugin *audio_output_plugins[] = {
&openal_output_plugin,
#endif
#ifdef HAVE_OSX
&osxPlugin,
&osx_output_plugin,
#endif
#ifdef ENABLE_RAOP_OUTPUT
&raopPlugin,
&raop_output_plugin,
#endif
#ifdef ENABLE_SOLARIS_OUTPUT
&solaris_output_plugin,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment