OutputPlugin: rename struct audio_output_plugin to AudioOutputPlugin

2014-01-28 11:22:27 +01:00
parent 2f873edc9c
commit e0dc721324
39 changed files with 53 additions and 50 deletions
--- a/src/output/plugins/AlsaOutputPlugin.cxx
+++ b/src/output/plugins/AlsaOutputPlugin.cxx
@@ -848,7 +848,7 @@ alsa_play(struct audio_output *ao, const void *chunk, size_t size,
 	}
 }

-const struct audio_output_plugin alsa_output_plugin = {
+const struct AudioOutputPlugin alsa_output_plugin = {
 	"alsa",
 	alsa_test_default_device,
 	alsa_init,
--- a/src/output/plugins/AlsaOutputPlugin.hxx
+++ b/src/output/plugins/AlsaOutputPlugin.hxx
@@ -20,6 +20,6 @@
 #ifndef MPD_ALSA_OUTPUT_PLUGIN_HXX
 #define MPD_ALSA_OUTPUT_PLUGIN_HXX

-extern const struct audio_output_plugin alsa_output_plugin;
+extern const struct AudioOutputPlugin alsa_output_plugin;

 #endif
--- a/src/output/plugins/AoOutputPlugin.cxx
+++ b/src/output/plugins/AoOutputPlugin.cxx
@@ -267,7 +267,7 @@ ao_output_play(struct audio_output *ao, const void *chunk, size_t size,
 	return size;
 }

-const struct audio_output_plugin ao_output_plugin = {
+const struct AudioOutputPlugin ao_output_plugin = {
 	"ao",
 	nullptr,
 	ao_output_init,
--- a/src/output/plugins/AoOutputPlugin.hxx
+++ b/src/output/plugins/AoOutputPlugin.hxx
@@ -20,6 +20,6 @@
 #ifndef MPD_AO_OUTPUT_PLUGIN_HXX
 #define MPD_AO_OUTPUT_PLUGIN_HXX

-extern const struct audio_output_plugin ao_output_plugin;
+extern const struct AudioOutputPlugin ao_output_plugin;

 #endif
--- a/src/output/plugins/FifoOutputPlugin.cxx
+++ b/src/output/plugins/FifoOutputPlugin.cxx
@@ -294,7 +294,7 @@ fifo_output_play(struct audio_output *ao, const void *chunk, size_t size,
 	}
 }

-const struct audio_output_plugin fifo_output_plugin = {
+const struct AudioOutputPlugin fifo_output_plugin = {
 	"fifo",
 	nullptr,
 	fifo_output_init,
--- a/src/output/plugins/FifoOutputPlugin.hxx
+++ b/src/output/plugins/FifoOutputPlugin.hxx
@@ -20,6 +20,6 @@
 #ifndef MPD_FIFO_OUTPUT_PLUGIN_HXX
 #define MPD_FIFO_OUTPUT_PLUGIN_HXX

-extern const struct audio_output_plugin fifo_output_plugin;
+extern const struct AudioOutputPlugin fifo_output_plugin;

 #endif
--- a/src/output/plugins/HttpdOutputPlugin.cxx
+++ b/src/output/plugins/HttpdOutputPlugin.cxx
@@ -582,7 +582,7 @@ httpd_output_cancel(struct audio_output *ao)
 		});
 }

-const struct audio_output_plugin httpd_output_plugin = {
+const struct AudioOutputPlugin httpd_output_plugin = {
 	"httpd",
 	nullptr,
 	httpd_output_init,
--- a/src/output/plugins/HttpdOutputPlugin.hxx
+++ b/src/output/plugins/HttpdOutputPlugin.hxx
@@ -20,6 +20,6 @@
 #ifndef MPD_HTTPD_OUTPUT_PLUGIN_HXX
 #define MPD_HTTPD_OUTPUT_PLUGIN_HXX

-extern const struct audio_output_plugin httpd_output_plugin;
+extern const struct AudioOutputPlugin httpd_output_plugin;

 #endif
--- a/src/output/plugins/JackOutputPlugin.cxx
+++ b/src/output/plugins/JackOutputPlugin.cxx
@@ -746,7 +746,7 @@ mpd_jack_pause(struct audio_output *ao)
 	return true;
 }

-const struct audio_output_plugin jack_output_plugin = {
+const struct AudioOutputPlugin jack_output_plugin = {
 	"jack",
 	mpd_jack_test_default_device,
 	mpd_jack_init,
--- a/src/output/plugins/JackOutputPlugin.hxx
+++ b/src/output/plugins/JackOutputPlugin.hxx
@@ -20,6 +20,6 @@
 #ifndef MPD_JACK_OUTPUT_PLUGIN_HXX
 #define MPD_JACK_OUTPUT_PLUGIN_HXX

-extern const struct audio_output_plugin jack_output_plugin;
+extern const struct AudioOutputPlugin jack_output_plugin;

 #endif
--- a/src/output/plugins/NullOutputPlugin.cxx
+++ b/src/output/plugins/NullOutputPlugin.cxx
@@ -122,7 +122,7 @@ null_cancel(struct audio_output *ao)
 	nd->timer->Reset();
 }

-const struct audio_output_plugin null_output_plugin = {
+const struct AudioOutputPlugin null_output_plugin = {
 	"null",
 	nullptr,
 	null_init,
--- a/src/output/plugins/NullOutputPlugin.hxx
+++ b/src/output/plugins/NullOutputPlugin.hxx
@@ -20,6 +20,6 @@
 #ifndef MPD_NULL_OUTPUT_PLUGIN_HXX
 #define MPD_NULL_OUTPUT_PLUGIN_HXX

-extern const struct audio_output_plugin null_output_plugin;
+extern const struct AudioOutputPlugin null_output_plugin;

 #endif
--- a/src/output/plugins/OSXOutputPlugin.cxx
+++ b/src/output/plugins/OSXOutputPlugin.cxx
@@ -409,7 +409,7 @@ osx_output_play(struct audio_output *ao, const void *chunk, size_t size,
 	return size;
 }

-const struct audio_output_plugin osx_output_plugin = {
+const struct AudioOutputPlugin osx_output_plugin = {
 	"osx",
 	osx_output_test_default_device,
 	osx_output_init,
--- a/src/output/plugins/OSXOutputPlugin.hxx
+++ b/src/output/plugins/OSXOutputPlugin.hxx
@@ -20,6 +20,6 @@
 #ifndef MPD_OSX_OUTPUT_PLUGIN_HXX
 #define MPD_OSX_OUTPUT_PLUGIN_HXX

-extern const struct audio_output_plugin osx_output_plugin;
+extern const struct AudioOutputPlugin osx_output_plugin;

 #endif
--- a/src/output/plugins/OpenALOutputPlugin.cxx
+++ b/src/output/plugins/OpenALOutputPlugin.cxx
@@ -266,7 +266,7 @@ openal_cancel(struct audio_output *ao)
 	od->filled = 0;
 }

-const struct audio_output_plugin openal_output_plugin = {
+const struct AudioOutputPlugin openal_output_plugin = {
 	"openal",
 	nullptr,
 	openal_init,
--- a/src/output/plugins/OpenALOutputPlugin.hxx
+++ b/src/output/plugins/OpenALOutputPlugin.hxx
@@ -20,6 +20,6 @@
 #ifndef MPD_OPENAL_OUTPUT_PLUGIN_HXX
 #define MPD_OPENAL_OUTPUT_PLUGIN_HXX

-extern const struct audio_output_plugin openal_output_plugin;
+extern const struct AudioOutputPlugin openal_output_plugin;

 #endif
--- a/src/output/plugins/OssOutputPlugin.cxx
+++ b/src/output/plugins/OssOutputPlugin.cxx
@@ -751,7 +751,7 @@ oss_output_play(struct audio_output *ao, const void *chunk, size_t size,
 	}
 }

-const struct audio_output_plugin oss_output_plugin = {
+const struct AudioOutputPlugin oss_output_plugin = {
 	"oss",
 	oss_output_test_default_device,
 	oss_output_init,
--- a/src/output/plugins/OssOutputPlugin.hxx
+++ b/src/output/plugins/OssOutputPlugin.hxx
@@ -20,6 +20,6 @@
 #ifndef MPD_OSS_OUTPUT_PLUGIN_HXX
 #define MPD_OSS_OUTPUT_PLUGIN_HXX

-extern const struct audio_output_plugin oss_output_plugin;
+extern const struct AudioOutputPlugin oss_output_plugin;

 #endif
--- a/src/output/plugins/PipeOutputPlugin.cxx
+++ b/src/output/plugins/PipeOutputPlugin.cxx
@@ -128,7 +128,7 @@ pipe_output_play(struct audio_output *ao, const void *chunk, size_t size,
 	return ret;
 }

-const struct audio_output_plugin pipe_output_plugin = {
+const struct AudioOutputPlugin pipe_output_plugin = {
 	"pipe",
 	nullptr,
 	pipe_output_init,
--- a/src/output/plugins/PipeOutputPlugin.hxx
+++ b/src/output/plugins/PipeOutputPlugin.hxx
@@ -20,6 +20,6 @@
 #ifndef MPD_PIPE_OUTPUT_PLUGIN_HXX
 #define MPD_PIPE_OUTPUT_PLUGIN_HXX

-extern const struct audio_output_plugin pipe_output_plugin;
+extern const struct AudioOutputPlugin pipe_output_plugin;

 #endif
--- a/src/output/plugins/PulseOutputPlugin.cxx
+++ b/src/output/plugins/PulseOutputPlugin.cxx
@@ -869,7 +869,7 @@ pulse_output_test_default_device(void)
 	return success;
 }

-const struct audio_output_plugin pulse_output_plugin = {
+const struct AudioOutputPlugin pulse_output_plugin = {
 	"pulse",
 	pulse_output_test_default_device,
 	pulse_output_init,
--- a/src/output/plugins/PulseOutputPlugin.hxx
+++ b/src/output/plugins/PulseOutputPlugin.hxx
@@ -25,7 +25,7 @@ struct PulseMixer;
 struct pa_cvolume;
 class Error;

-extern const struct audio_output_plugin pulse_output_plugin;
+extern const struct AudioOutputPlugin pulse_output_plugin;

 void
 pulse_output_lock(PulseOutput *po);
--- a/src/output/plugins/RecorderOutputPlugin.cxx
+++ b/src/output/plugins/RecorderOutputPlugin.cxx
@@ -243,7 +243,7 @@ recorder_output_play(struct audio_output *ao, const void *chunk, size_t size,
 		? size : 0;
 }

-const struct audio_output_plugin recorder_output_plugin = {
+const struct AudioOutputPlugin recorder_output_plugin = {
 	"recorder",
 	nullptr,
 	recorder_output_init,
--- a/src/output/plugins/RecorderOutputPlugin.hxx
+++ b/src/output/plugins/RecorderOutputPlugin.hxx
@@ -20,6 +20,6 @@
 #ifndef MPD_RECORDER_OUTPUT_PLUGIN_HXX
 #define MPD_RECORDER_OUTPUT_PLUGIN_HXX

-extern const struct audio_output_plugin recorder_output_plugin;
+extern const struct AudioOutputPlugin recorder_output_plugin;

 #endif
--- a/src/output/plugins/RoarOutputPlugin.cxx
+++ b/src/output/plugins/RoarOutputPlugin.cxx
@@ -409,7 +409,7 @@ roar_send_tag(struct audio_output *ao, const Tag *meta)
 	self->SendTag(*meta);
 }

-const struct audio_output_plugin roar_output_plugin = {
+const struct AudioOutputPlugin roar_output_plugin = {
 	"roar",
 	nullptr,
 	roar_init,
--- a/src/output/plugins/RoarOutputPlugin.hxx
+++ b/src/output/plugins/RoarOutputPlugin.hxx
@@ -22,7 +22,7 @@

 class RoarOutput;

-extern const struct audio_output_plugin roar_output_plugin;
+extern const struct AudioOutputPlugin roar_output_plugin;

 int
 roar_output_get_volume(RoarOutput *roar);
--- a/src/output/plugins/ShoutOutputPlugin.cxx
+++ b/src/output/plugins/ShoutOutputPlugin.cxx
@@ -525,7 +525,7 @@ static void my_shout_set_tag(struct audio_output *ao,
 	write_page(sd, IgnoreError());
 }

-const struct audio_output_plugin shout_output_plugin = {
+const struct AudioOutputPlugin shout_output_plugin = {
 	"shout",
 	nullptr,
 	my_shout_init_driver,
--- a/src/output/plugins/ShoutOutputPlugin.hxx
+++ b/src/output/plugins/ShoutOutputPlugin.hxx
@@ -20,6 +20,6 @@
 #ifndef MPD_SHOUT_OUTPUT_PLUGIN_HXX
 #define MPD_SHOUT_OUTPUT_PLUGIN_HXX

-extern const struct audio_output_plugin shout_output_plugin;
+extern const struct AudioOutputPlugin shout_output_plugin;

 #endif
--- a/src/output/plugins/SolarisOutputPlugin.cxx
+++ b/src/output/plugins/SolarisOutputPlugin.cxx
@@ -182,7 +182,7 @@ solaris_output_cancel(struct audio_output *ao)
 	ioctl(so->fd, I_FLUSH);
 }

-const struct audio_output_plugin solaris_output_plugin = {
+const struct AudioOutputPlugin solaris_output_plugin = {
 	"solaris",
 	solaris_output_test_default_device,
 	solaris_output_init,
--- a/src/output/plugins/SolarisOutputPlugin.hxx
+++ b/src/output/plugins/SolarisOutputPlugin.hxx
@@ -20,6 +20,6 @@
 #ifndef MPD_SOLARIS_OUTPUT_PLUGIN_HXX
 #define MPD_SOLARIS_OUTPUT_PLUGIN_HXX

-extern const struct audio_output_plugin solaris_output_plugin;
+extern const struct AudioOutputPlugin solaris_output_plugin;

 #endif
--- a/src/output/plugins/WinmmOutputPlugin.cxx
+++ b/src/output/plugins/WinmmOutputPlugin.cxx
@@ -334,7 +334,7 @@ winmm_output_cancel(struct audio_output *ao)
 	winmm_stop(wo);
 }

-const struct audio_output_plugin winmm_output_plugin = {
+const struct AudioOutputPlugin winmm_output_plugin = {
 	"winmm",
 	winmm_output_test_default_device,
 	winmm_output_init,
--- a/src/output/plugins/WinmmOutputPlugin.hxx
+++ b/src/output/plugins/WinmmOutputPlugin.hxx
@@ -31,7 +31,7 @@

 struct WinmmOutput;

-extern const struct audio_output_plugin winmm_output_plugin;
+extern const struct AudioOutputPlugin winmm_output_plugin;

 gcc_pure
 HWAVEOUT