Commit 13b04dc9 authored by Max Kellermann's avatar Max Kellermann

mixer/Internal: add "noexcept"

parent 011106b5
...@@ -51,14 +51,15 @@ public: ...@@ -51,14 +51,15 @@ public:
bool failed = false; bool failed = false;
public: public:
explicit Mixer(const MixerPlugin &_plugin, MixerListener &_listener) explicit Mixer(const MixerPlugin &_plugin,
MixerListener &_listener) noexcept
:plugin(_plugin), listener(_listener) {} :plugin(_plugin), listener(_listener) {}
Mixer(const Mixer &) = delete; Mixer(const Mixer &) = delete;
virtual ~Mixer() {} virtual ~Mixer() {}
bool IsPlugin(const MixerPlugin &other) const { bool IsPlugin(const MixerPlugin &other) const noexcept {
return &plugin == &other; return &plugin == &other;
} }
...@@ -72,7 +73,7 @@ public: ...@@ -72,7 +73,7 @@ public:
/** /**
* Close mixer device * Close mixer device
*/ */
virtual void Close() = 0; virtual void Close() noexcept = 0;
/** /**
* Reads the current volume. * Reads the current volume.
......
...@@ -95,7 +95,7 @@ public: ...@@ -95,7 +95,7 @@ public:
/* virtual methods from class Mixer */ /* virtual methods from class Mixer */
void Open() override; void Open() override;
void Close() override; void Close() noexcept override;
int GetVolume() override; int GetVolume() override;
void SetVolume(unsigned volume) override; void SetVolume(unsigned volume) override;
}; };
...@@ -252,7 +252,7 @@ AlsaMixer::Open() ...@@ -252,7 +252,7 @@ AlsaMixer::Open()
} }
void void
AlsaMixer::Close() AlsaMixer::Close() noexcept
{ {
assert(handle != nullptr); assert(handle != nullptr);
......
...@@ -40,7 +40,7 @@ public: ...@@ -40,7 +40,7 @@ public:
virtual void Open() override { virtual void Open() override {
} }
virtual void Close() override { void Close() noexcept override {
} }
virtual int GetVolume() override; virtual int GetVolume() override;
......
...@@ -37,7 +37,7 @@ public: ...@@ -37,7 +37,7 @@ public:
void Open() override { void Open() override {
} }
void Close() override { void Close() noexcept override {
} }
int GetVolume() override { int GetVolume() override {
......
...@@ -59,7 +59,7 @@ public: ...@@ -59,7 +59,7 @@ public:
/* virtual methods from class Mixer */ /* virtual methods from class Mixer */
void Open() override; void Open() override;
void Close() override; void Close() noexcept override;
int GetVolume() override; int GetVolume() override;
void SetVolume(unsigned volume) override; void SetVolume(unsigned volume) override;
}; };
...@@ -105,7 +105,7 @@ oss_mixer_init(gcc_unused EventLoop &event_loop, gcc_unused AudioOutput &ao, ...@@ -105,7 +105,7 @@ oss_mixer_init(gcc_unused EventLoop &event_loop, gcc_unused AudioOutput &ao,
} }
void void
OssMixer::Close() OssMixer::Close() noexcept
{ {
assert(device_fd >= 0); assert(device_fd >= 0);
......
...@@ -59,7 +59,7 @@ public: ...@@ -59,7 +59,7 @@ public:
void Open() override { void Open() override {
} }
void Close() override { void Close() noexcept override {
} }
int GetVolume() override; int GetVolume() override;
......
...@@ -37,7 +37,7 @@ public: ...@@ -37,7 +37,7 @@ public:
void Open() override { void Open() override {
} }
virtual void Close() override { void Close() noexcept override {
} }
int GetVolume() override; int GetVolume() override;
......
...@@ -50,7 +50,7 @@ public: ...@@ -50,7 +50,7 @@ public:
void Open() override { void Open() override {
} }
virtual void Close() override { void Close() noexcept override {
} }
int GetVolume() override { int GetVolume() override {
......
...@@ -43,7 +43,7 @@ public: ...@@ -43,7 +43,7 @@ public:
void Open() override { void Open() override {
} }
void Close() override { void Close() noexcept override {
} }
int GetVolume() override; int GetVolume() override;
......
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