diff options
| author | François Revol <revol@free.fr> | 2017-02-20 00:45:46 +0100 |
|---|---|---|
| committer | Max Kellermann <max@musicpd.org> | 2017-02-20 11:25:00 +0100 |
| commit | 46aa4d2f91d570a398527aefbd707414abba6b0e (patch) | |
| tree | 1d0865ae78ad052591d91a7533c51b8d16f09797 /src | |
| parent | d0b4bd08e1e19d6204d9502b5995365c257ecb43 (diff) | |
haiku: fix build
Some missing bits when converted to C++ exceptions...
Diffstat (limited to 'src')
| -rw-r--r-- | src/mixer/plugins/HaikuMixerPlugin.cxx | 20 | ||||
| -rw-r--r-- | src/output/plugins/HaikuOutputPlugin.cxx | 1 |
2 files changed, 11 insertions, 10 deletions
diff --git a/src/mixer/plugins/HaikuMixerPlugin.cxx b/src/mixer/plugins/HaikuMixerPlugin.cxx index d66e76526..07da75547 100644 --- a/src/mixer/plugins/HaikuMixerPlugin.cxx +++ b/src/mixer/plugins/HaikuMixerPlugin.cxx @@ -25,6 +25,8 @@ #include "output/plugins/HaikuOutputPlugin.hxx" #include "Compiler.h" +#include "util/RuntimeError.hxx" + class HaikuMixer final : public Mixer { /** the base mixer class */ HaikuOutput &self; @@ -35,36 +37,34 @@ public: self(_output) {} /* virtual methods from class Mixer */ - virtual bool Open(gcc_unused Error &error) override { - return true; + virtual void Open() override { } virtual void Close() override { } - virtual int GetVolume(Error &error) override; - virtual bool SetVolume(unsigned volume, Error &error) override; + virtual int GetVolume() override; + virtual void SetVolume(unsigned volume) override; }; static Mixer * haiku_mixer_init(gcc_unused EventLoop &event_loop, AudioOutput &ao, MixerListener &listener, - gcc_unused const ConfigBlock &block, - gcc_unused Error &error) + gcc_unused const ConfigBlock &block) { return new HaikuMixer((HaikuOutput &)ao, listener); } int -HaikuMixer::GetVolume(gcc_unused Error &error) +HaikuMixer::GetVolume() { return haiku_output_get_volume(self); } -bool -HaikuMixer::SetVolume(unsigned volume, gcc_unused Error &error) +void +HaikuMixer::SetVolume(unsigned volume) { - return haiku_output_set_volume(self, volume); + haiku_output_set_volume(self, volume); } const MixerPlugin haiku_mixer_plugin = { diff --git a/src/output/plugins/HaikuOutputPlugin.cxx b/src/output/plugins/HaikuOutputPlugin.cxx index 472d3f568..1220f94fe 100644 --- a/src/output/plugins/HaikuOutputPlugin.cxx +++ b/src/output/plugins/HaikuOutputPlugin.cxx @@ -24,6 +24,7 @@ #include "../Wrapper.hxx" #include "mixer/MixerList.hxx" #include "util/Domain.hxx" +#include "system/Error.hxx" #include "Log.hxx" #include <AppFileInfo.h> |