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

output/pipewire: add `noexcept`

This commit is contained in:
Max Kellermann 2021-10-19 08:58:47 +02:00
parent 0697d1f859
commit aa9933c0b5
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mixer/plugins/PipeWireMixerPlugin.cxx
View File

@ -37,7 +37,7 @@ public:
{ {
} }
~PipeWireMixer() override; ~PipeWireMixer() noexcept override;
PipeWireMixer(const PipeWireMixer &) = delete; PipeWireMixer(const PipeWireMixer &) = delete;
PipeWireMixer &operator=(const PipeWireMixer &) = delete; PipeWireMixer &operator=(const PipeWireMixer &) = delete;
@ -89,7 +89,7 @@ pipewire_mixer_init([[maybe_unused]] EventLoop &event_loop, AudioOutput &ao,
return pm; return pm;
} }
PipeWireMixer::~PipeWireMixer() PipeWireMixer::~PipeWireMixer() noexcept
{ {
pipewire_output_clear_mixer(output, *this); pipewire_output_clear_mixer(output, *this);
} }

16
src/output/plugins/PipeWireOutputPlugin.cxx
View File

@ -136,9 +136,9 @@ public:
void SetVolume(float volume); void SetVolume(float volume);
void SetMixer(PipeWireMixer &_mixer); void SetMixer(PipeWireMixer &_mixer) noexcept;
void ClearMixer([[maybe_unused]] PipeWireMixer &old_mixer) { void ClearMixer([[maybe_unused]] PipeWireMixer &old_mixer) noexcept {
assert(mixer == &old_mixer); assert(mixer == &old_mixer);
mixer = nullptr; mixer = nullptr;
@ -178,7 +178,7 @@ private:
o.Drained(); o.Drained();
} }
void ControlInfo(const struct pw_stream_control *control) { void ControlInfo(const struct pw_stream_control *control) noexcept {
float sum = 0; float sum = 0;
unsigned c; unsigned c;
for (c = 0; c < control->n_values; c++) for (c = 0; c < control->n_values; c++)
@ -200,7 +200,7 @@ private:
o.ControlInfo(control); o.ControlInfo(control);
} }
void ParamChanged() { void ParamChanged() noexcept {
if (restore_volume) { if (restore_volume) {
SetVolume(volume); SetVolume(volume);
restore_volume = false; restore_volume = false;
@ -209,7 +209,7 @@ private:
static void ParamChanged(void *data, static void ParamChanged(void *data,
uint32_t id, uint32_t id,
const struct spa_pod *param) const struct spa_pod *param) noexcept
{ {
if (id != SPA_PARAM_Format || param == NULL) if (id != SPA_PARAM_Format || param == NULL)
return; return;
@ -643,7 +643,7 @@ PipeWireOutput::Pause() noexcept
} }
inline void inline void
PipeWireOutput::SetMixer(PipeWireMixer &_mixer) PipeWireOutput::SetMixer(PipeWireMixer &_mixer) noexcept
{ {
assert(mixer == nullptr); assert(mixer == nullptr);
@ -653,13 +653,13 @@ PipeWireOutput::SetMixer(PipeWireMixer &_mixer)
} }
void void
pipewire_output_set_mixer(PipeWireOutput &po, PipeWireMixer &pm) pipewire_output_set_mixer(PipeWireOutput &po, PipeWireMixer &pm) noexcept
{ {
po.SetMixer(pm); po.SetMixer(pm);
} }
void void
pipewire_output_clear_mixer(PipeWireOutput &po, PipeWireMixer &pm) pipewire_output_clear_mixer(PipeWireOutput &po, PipeWireMixer &pm) noexcept
{ {
po.ClearMixer(pm); po.ClearMixer(pm);
} }

4
src/output/plugins/PipeWireOutputPlugin.hxx
View File

@ -26,10 +26,10 @@ class PipeWireMixer;
extern const struct AudioOutputPlugin pipewire_output_plugin; extern const struct AudioOutputPlugin pipewire_output_plugin;
void void
pipewire_output_set_mixer(PipeWireOutput &po, PipeWireMixer &pm); pipewire_output_set_mixer(PipeWireOutput &po, PipeWireMixer &pm) noexcept;
void void
pipewire_output_clear_mixer(PipeWireOutput &po, PipeWireMixer &pm); pipewire_output_clear_mixer(PipeWireOutput &po, PipeWireMixer &pm) noexcept;
void void
pipewire_output_set_volume(PipeWireOutput &output, float volume); pipewire_output_set_volume(PipeWireOutput &output, float volume);