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

Mixer: rename struct mixer_plugin to MixerPlugin

Browse Source
This commit is contained in:
Max Kellermann 2014-02-05 17:22:34 +01:00
parent 243c4e1e83
commit f86e159536
13 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mixer/MixerControl.cxx
View File

@ -26,7 +26,7 @@
Mixer * Mixer *
mixer_new(EventLoop &event_loop, mixer_new(EventLoop &event_loop,
const mixer_plugin *plugin, void *ao, const MixerPlugin *plugin, void *ao,
const config_param &param, const config_param &param,
Error &error) Error &error)
{ {

4
src/mixer/MixerControl.hxx
View File

@ -28,11 +28,11 @@
class Error; class Error;
class Mixer; class Mixer;
class EventLoop; class EventLoop;
struct mixer_plugin; struct MixerPlugin;
struct config_param; struct config_param;
Mixer * Mixer *
mixer_new(EventLoop &event_loop, const mixer_plugin *plugin, void *ao, mixer_new(EventLoop &event_loop, const MixerPlugin *plugin, void *ao,
const config_param &param, const config_param &param,
Error &error); Error &error);

6
src/mixer/MixerInternal.hxx
View File

@ -26,7 +26,7 @@
class Mixer { class Mixer {
public: public:
const struct mixer_plugin *plugin; const MixerPlugin *plugin;
/** /**
* This mutex protects all of the mixer struct, including its * This mutex protects all of the mixer struct, including its
@ -46,12 +46,12 @@ public:
bool failed; bool failed;
public: public:
Mixer(const mixer_plugin &_plugin) Mixer(const MixerPlugin &_plugin)
:plugin(&_plugin), :plugin(&_plugin),
open(false), open(false),
failed(false) {} failed(false) {}
bool IsPlugin(const mixer_plugin &other) const { bool IsPlugin(const MixerPlugin &other) const {
return plugin == &other; return plugin == &other;
} }
}; };

14
src/mixer/MixerList.hxx
View File

@ -25,11 +25,13 @@
#ifndef MPD_MIXER_LIST_HXX #ifndef MPD_MIXER_LIST_HXX
#define MPD_MIXER_LIST_HXX #define MPD_MIXER_LIST_HXX
extern const struct mixer_plugin software_mixer_plugin; struct MixerPlugin;
extern const struct mixer_plugin alsa_mixer_plugin;
extern const struct mixer_plugin oss_mixer_plugin; extern const MixerPlugin software_mixer_plugin;
extern const struct mixer_plugin roar_mixer_plugin; extern const MixerPlugin alsa_mixer_plugin;
extern const struct mixer_plugin pulse_mixer_plugin; extern const MixerPlugin oss_mixer_plugin;
extern const struct mixer_plugin winmm_mixer_plugin; extern const MixerPlugin roar_mixer_plugin;
extern const MixerPlugin pulse_mixer_plugin;
extern const MixerPlugin winmm_mixer_plugin;
#endif #endif

2
src/mixer/MixerPlugin.hxx
View File

@ -32,7 +32,7 @@ class Mixer;
class EventLoop; class EventLoop;
class Error; class Error;
struct mixer_plugin { struct MixerPlugin {
/** /**
* Alocates and configures a mixer device. * Alocates and configures a mixer device.
* *

2
src/mixer/plugins/AlsaMixerPlugin.cxx
View File

@ -374,7 +374,7 @@ alsa_mixer_set_volume(Mixer *mixer, unsigned volume, Error &error)
return am->SetVolume(volume, error); return am->SetVolume(volume, error);
} }
const struct mixer_plugin alsa_mixer_plugin = { const MixerPlugin alsa_mixer_plugin = {
alsa_mixer_init, alsa_mixer_init,
alsa_mixer_finish, alsa_mixer_finish,
alsa_mixer_open, alsa_mixer_open,

2
src/mixer/plugins/OssMixerPlugin.cxx
View File

@ -231,7 +231,7 @@ oss_mixer_set_volume(Mixer *mixer, unsigned volume, Error &error)
return om->SetVolume(volume, error); return om->SetVolume(volume, error);
} }
const struct mixer_plugin oss_mixer_plugin = { const MixerPlugin oss_mixer_plugin = {
oss_mixer_init, oss_mixer_init,
oss_mixer_finish, oss_mixer_finish,
oss_mixer_open, oss_mixer_open,

2
src/mixer/plugins/PulseMixerPlugin.cxx
View File

@ -215,7 +215,7 @@ pulse_mixer_set_volume(Mixer *mixer, unsigned volume, Error &error)
return success; return success;
} }
const struct mixer_plugin pulse_mixer_plugin = { const MixerPlugin pulse_mixer_plugin = {
pulse_mixer_init, pulse_mixer_init,
pulse_mixer_finish, pulse_mixer_finish,
nullptr, nullptr,

2
src/mixer/plugins/RoarMixerPlugin.cxx
View File

@ -64,7 +64,7 @@ roar_mixer_set_volume(Mixer *mixer, unsigned volume,
return roar_output_set_volume(self->self, volume); return roar_output_set_volume(self->self, volume);
} }
const struct mixer_plugin roar_mixer_plugin = { const MixerPlugin roar_mixer_plugin = {
roar_mixer_init, roar_mixer_init,
roar_mixer_finish, roar_mixer_finish,
nullptr, nullptr,

2
src/mixer/plugins/SoftwareMixerPlugin.cxx
View File

@ -110,7 +110,7 @@ software_mixer_set_volume(Mixer *mixer, unsigned volume,
return true; return true;
} }
const struct mixer_plugin software_mixer_plugin = { const MixerPlugin software_mixer_plugin = {
software_mixer_init, software_mixer_init,
software_mixer_finish, software_mixer_finish,
nullptr, nullptr,

2
src/mixer/plugins/WinmmMixerPlugin.cxx
View File

@ -104,7 +104,7 @@ winmm_mixer_set_volume(Mixer *mixer, unsigned volume, Error &error)
return true; return true;
} }
const struct mixer_plugin winmm_mixer_plugin = { const MixerPlugin winmm_mixer_plugin = {
winmm_mixer_init, winmm_mixer_init,
winmm_mixer_finish, winmm_mixer_finish,
nullptr, nullptr,

2
src/output/Init.cxx
View File

@ -114,7 +114,7 @@ audio_output_mixer_type(const config_param &param)
static Mixer * static Mixer *
audio_output_load_mixer(EventLoop &event_loop, AudioOutput *ao, audio_output_load_mixer(EventLoop &event_loop, AudioOutput *ao,
const config_param &param, const config_param &param,
const struct mixer_plugin *plugin, const MixerPlugin *plugin,
Filter &filter_chain, Filter &filter_chain,
Error &error) Error &error)
{ {

3
src/output/OutputPlugin.hxx
View File

@ -28,6 +28,7 @@ struct config_param;
struct AudioFormat; struct AudioFormat;
struct Tag; struct Tag;
struct AudioOutput; struct AudioOutput;
struct MixerPlugin;
class Error; class Error;
/** /**
@ -147,7 +148,7 @@ struct AudioOutputPlugin {
* created, this mixer plugin gets the same #config_param as * created, this mixer plugin gets the same #config_param as
* this audio output device. * this audio output device.
*/ */
const struct mixer_plugin *mixer_plugin; const MixerPlugin *mixer_plugin;
}; };
static inline bool static inline bool