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) ...@@ -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", .name = "alsa",
.test_default_device = alsa_test_default_device, .test_default_device = alsa_test_default_device,
.init = alsa_init, .init = alsa_init,
......
...@@ -20,6 +20,6 @@ ...@@ -20,6 +20,6 @@
#ifndef MPD_ALSA_OUTPUT_PLUGIN_H #ifndef MPD_ALSA_OUTPUT_PLUGIN_H
#define 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 #endif
...@@ -418,7 +418,7 @@ osx_output_play(void *data, const void *chunk, size_t size, ...@@ -418,7 +418,7 @@ osx_output_play(void *data, const void *chunk, size_t size,
return nbytes; return nbytes;
} }
const struct audio_output_plugin osxPlugin = { const struct audio_output_plugin osx_output_plugin = {
.name = "osx", .name = "osx",
.test_default_device = osx_output_test_default_device, .test_default_device = osx_output_test_default_device,
.init = osx_output_init, .init = osx_output_init,
......
...@@ -1031,7 +1031,7 @@ raop_output_play(void *data, const void *chunk, size_t size, ...@@ -1031,7 +1031,7 @@ raop_output_play(void *data, const void *chunk, size_t size,
return rval; return rval;
} }
const struct audio_output_plugin raopPlugin = { const struct audio_output_plugin raop_output_plugin = {
.name = "raop", .name = "raop",
.init = raop_output_init, .init = raop_output_init,
.finish = raop_output_finish, .finish = raop_output_finish,
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
struct raop_data; struct raop_data;
extern const struct audio_output_plugin raopPlugin; extern const struct audio_output_plugin raop_output_plugin;
bool bool
raop_set_volume(struct raop_data *rd, unsigned volume, GError **error_r); raop_set_volume(struct raop_data *rd, unsigned volume, GError **error_r);
......
...@@ -551,7 +551,7 @@ static void my_shout_set_tag(void *data, ...@@ -551,7 +551,7 @@ static void my_shout_set_tag(void *data,
write_page(sd, NULL); write_page(sd, NULL);
} }
const struct audio_output_plugin shoutPlugin = { const struct audio_output_plugin shout_output_plugin = {
.name = "shout", .name = "shout",
.init = my_shout_init_driver, .init = my_shout_init_driver,
.finish = my_shout_finish_driver, .finish = my_shout_finish_driver,
......
...@@ -20,6 +20,6 @@ ...@@ -20,6 +20,6 @@
#ifndef MPD_SHOUT_OUTPUT_PLUGIN_H #ifndef MPD_SHOUT_OUTPUT_PLUGIN_H
#define 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 #endif
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
const struct audio_output_plugin *audio_output_plugins[] = { const struct audio_output_plugin *audio_output_plugins[] = {
#ifdef HAVE_SHOUT #ifdef HAVE_SHOUT
&shoutPlugin, &shout_output_plugin,
#endif #endif
&null_output_plugin, &null_output_plugin,
#ifdef HAVE_FIFO #ifdef HAVE_FIFO
...@@ -52,7 +52,7 @@ const struct audio_output_plugin *audio_output_plugins[] = { ...@@ -52,7 +52,7 @@ const struct audio_output_plugin *audio_output_plugins[] = {
&pipe_output_plugin, &pipe_output_plugin,
#endif #endif
#ifdef HAVE_ALSA #ifdef HAVE_ALSA
&alsaPlugin, &alsa_output_plugin,
#endif #endif
#ifdef HAVE_ROAR #ifdef HAVE_ROAR
&roar_output_plugin, &roar_output_plugin,
...@@ -67,10 +67,10 @@ const struct audio_output_plugin *audio_output_plugins[] = { ...@@ -67,10 +67,10 @@ const struct audio_output_plugin *audio_output_plugins[] = {
&openal_output_plugin, &openal_output_plugin,
#endif #endif
#ifdef HAVE_OSX #ifdef HAVE_OSX
&osxPlugin, &osx_output_plugin,
#endif #endif
#ifdef ENABLE_RAOP_OUTPUT #ifdef ENABLE_RAOP_OUTPUT
&raopPlugin, &raop_output_plugin,
#endif #endif
#ifdef ENABLE_SOLARIS_OUTPUT #ifdef ENABLE_SOLARIS_OUTPUT
&solaris_output_plugin, &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