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

mixer/Plugin: pass AudioOutput to init()

Browse Source 
Fix breakage from commit bea5681fd8
This commit is contained in:
Max Kellermann 2017-08-10 13:07:36 +02:00
parent fb0dbce15b
commit a257504ba4
13 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mixer/MixerControl.cxx
View File

@ -25,7 +25,7 @@
Mixer * Mixer *
mixer_new(EventLoop &event_loop, mixer_new(EventLoop &event_loop,
const MixerPlugin &plugin, FilteredAudioOutput &ao, const MixerPlugin &plugin, AudioOutput &ao,
MixerListener &listener, MixerListener &listener,
const ConfigBlock &block) const ConfigBlock &block)
{ {

4
src/mixer/MixerControl.hxx
View File

@ -27,7 +27,7 @@
class Mixer; class Mixer;
class EventLoop; class EventLoop;
struct FilteredAudioOutput; class AudioOutput;
struct MixerPlugin; struct MixerPlugin;
class MixerListener; class MixerListener;
struct ConfigBlock; struct ConfigBlock;
@ -37,7 +37,7 @@ struct ConfigBlock;
*/ */
Mixer * Mixer *
mixer_new(EventLoop &event_loop, const MixerPlugin &plugin, mixer_new(EventLoop &event_loop, const MixerPlugin &plugin,
FilteredAudioOutput &ao, AudioOutput &ao,
MixerListener &listener, MixerListener &listener,
const ConfigBlock &block); const ConfigBlock &block);

4
src/mixer/MixerPlugin.hxx
View File

@ -28,7 +28,7 @@
#define MPD_MIXER_PLUGIN_HXX #define MPD_MIXER_PLUGIN_HXX
struct ConfigBlock; struct ConfigBlock;
struct FilteredAudioOutput; class AudioOutput;
class Mixer; class Mixer;
class MixerListener; class MixerListener;
class EventLoop; class EventLoop;
@ -43,7 +43,7 @@ struct MixerPlugin {
* @param param the configuration section * @param param the configuration section
* @return a mixer object * @return a mixer object
*/ */
Mixer *(*init)(EventLoop &event_loop, FilteredAudioOutput &ao, Mixer *(*init)(EventLoop &event_loop, AudioOutput &ao,
MixerListener &listener, MixerListener &listener,
const ConfigBlock &block); const ConfigBlock &block);

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

@ -173,7 +173,7 @@ AlsaMixer::Configure(const ConfigBlock &block)
} }
static Mixer * static Mixer *
alsa_mixer_init(EventLoop &event_loop, gcc_unused FilteredAudioOutput &ao, alsa_mixer_init(EventLoop &event_loop, gcc_unused AudioOutput &ao,
MixerListener &listener, MixerListener &listener,
const ConfigBlock &block) const ConfigBlock &block)
{ {

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

@ -48,7 +48,7 @@ public:
}; };
static Mixer * static Mixer *
haiku_mixer_init(gcc_unused EventLoop &event_loop, FilteredAudioOutput &ao, haiku_mixer_init(gcc_unused EventLoop &event_loop, AudioOutput &ao,
MixerListener &listener, MixerListener &listener,
gcc_unused const ConfigBlock &block) gcc_unused const ConfigBlock &block)
{ {

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

@ -51,7 +51,7 @@ public:
static Mixer * static Mixer *
null_mixer_init(gcc_unused EventLoop &event_loop, null_mixer_init(gcc_unused EventLoop &event_loop,
gcc_unused FilteredAudioOutput &ao, gcc_unused AudioOutput &ao,
MixerListener &listener, MixerListener &listener,
gcc_unused const ConfigBlock &block) gcc_unused const ConfigBlock &block)
{ {

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

@ -98,7 +98,7 @@ OssMixer::Configure(const ConfigBlock &block)
static Mixer * static Mixer *
oss_mixer_init(gcc_unused EventLoop &event_loop, oss_mixer_init(gcc_unused EventLoop &event_loop,
gcc_unused FilteredAudioOutput &ao, gcc_unused AudioOutput &ao,
MixerListener &listener, MixerListener &listener,
const ConfigBlock &block) const ConfigBlock &block)
{ {

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

@ -161,7 +161,7 @@ pulse_mixer_on_change(PulseMixer &pm,
} }
static Mixer * static Mixer *
pulse_mixer_init(gcc_unused EventLoop &event_loop, FilteredAudioOutput &ao, pulse_mixer_init(gcc_unused EventLoop &event_loop, AudioOutput &ao,
MixerListener &listener, MixerListener &listener,
gcc_unused const ConfigBlock &block) gcc_unused const ConfigBlock &block)
{ {

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

@ -45,7 +45,7 @@ public:
}; };
static Mixer * static Mixer *
roar_mixer_init(gcc_unused EventLoop &event_loop, FilteredAudioOutput &ao, roar_mixer_init(gcc_unused EventLoop &event_loop, AudioOutput &ao,
MixerListener &listener, MixerListener &listener,
gcc_unused const ConfigBlock &block) gcc_unused const ConfigBlock &block)
{ {

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

@ -58,7 +58,7 @@ public:
static Mixer * static Mixer *
software_mixer_init(gcc_unused EventLoop &event_loop, software_mixer_init(gcc_unused EventLoop &event_loop,
gcc_unused FilteredAudioOutput &ao, gcc_unused AudioOutput &ao,
MixerListener &listener, MixerListener &listener,
gcc_unused const ConfigBlock &block) gcc_unused const ConfigBlock &block)
{ {

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

@ -64,7 +64,7 @@ winmm_volume_encode(int volume)
} }
static Mixer * static Mixer *
winmm_mixer_init(gcc_unused EventLoop &event_loop, FilteredAudioOutput &ao, winmm_mixer_init(gcc_unused EventLoop &event_loop, AudioOutput &ao,
MixerListener &listener, MixerListener &listener,
gcc_unused const ConfigBlock &block) gcc_unused const ConfigBlock &block)
{ {

10
src/output/Init.cxx
View File

@ -118,19 +118,21 @@ audio_output_load_mixer(EventLoop &event_loop, FilteredAudioOutput &ao,
return nullptr; return nullptr;
case MixerType::NULL_: case MixerType::NULL_:
return mixer_new(event_loop, null_mixer_plugin, ao, listener, return mixer_new(event_loop, null_mixer_plugin,
*ao.output, listener,
block); block);
case MixerType::HARDWARE: case MixerType::HARDWARE:
if (plugin == nullptr) if (plugin == nullptr)
return nullptr; return nullptr;
return mixer_new(event_loop, *plugin, ao, listener, return mixer_new(event_loop, *plugin,
*ao.output, listener,
block); block);
case MixerType::SOFTWARE: case MixerType::SOFTWARE:
mixer = mixer_new(event_loop, software_mixer_plugin, ao, mixer = mixer_new(event_loop, software_mixer_plugin,
listener, *ao.output, listener,
ConfigBlock()); ConfigBlock());
assert(mixer != nullptr); assert(mixer != nullptr);

2
test/read_mixer.cxx
View File

@ -51,7 +51,7 @@ try {
EventLoop event_loop; EventLoop event_loop;
Mixer *mixer = mixer_new(event_loop, alsa_mixer_plugin, Mixer *mixer = mixer_new(event_loop, alsa_mixer_plugin,
*(FilteredAudioOutput *)nullptr, *(AudioOutput *)nullptr,
*(MixerListener *)nullptr, *(MixerListener *)nullptr,
ConfigBlock()); ConfigBlock());