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

mixer/Control: convert pointers to references

Browse Source
This commit is contained in:
Max Kellermann
2022-08-18 14:14:58 +02:00
parent dd2cab1488
commit 3eedcc55b9
8 changed files with 51 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/output/Control.cxx
View File

@@ -276,7 +276,7 @@ AudioOutputControl::Open(std::unique_lock<Mutex> &lock,
if (open2 && output->mixer != nullptr) {
const ScopeUnlock unlock(mutex);
try {
mixer_open(output->mixer);
mixer_open(*output->mixer);
} catch (...) {
FmtError(output_domain,
"Failed to open mixer for '{}': {}",
@@ -296,7 +296,7 @@ AudioOutputControl::CloseWait(std::unique_lock<Mutex> &lock) noexcept
return;
if (output->mixer != nullptr)
mixer_auto_close(output->mixer);
mixer_auto_close(*output->mixer);
assert(!open || !fail_timer.IsDefined());
@@ -360,7 +360,7 @@ AudioOutputControl::LockPauseAsync() noexcept
/* the device has no pause mode: close the mixer,
unless its "global" flag is set (checked by
mixer_auto_close()) */
mixer_auto_close(output->mixer);
mixer_auto_close(*output->mixer);
if (output)
output->Interrupt();
@@ -419,7 +419,7 @@ AudioOutputControl::LockRelease() noexcept
/* the device has no pause mode: close the mixer,
unless its "global" flag is set (checked by
mixer_auto_close()) */
mixer_auto_close(output->mixer);
mixer_auto_close(*output->mixer);
std::unique_lock<Mutex> lock(mutex);

4
src/output/OutputCommand.cxx
View File

@@ -75,7 +75,7 @@ audio_output_disable_index(MultipleOutputs &outputs,
auto *mixer = ao.GetMixer();
if (mixer != nullptr) {
mixer_close(mixer);
mixer_close(*mixer);
mixer_memento.InvalidateHardwareVolume();
idle_add(IDLE_MIXER);
}
@@ -102,7 +102,7 @@ audio_output_toggle_index(MultipleOutputs &outputs,
if (!enabled) {
auto *mixer = ao.GetMixer();
if (mixer != nullptr) {
mixer_close(mixer);
mixer_close(*mixer);
mixer_memento.InvalidateHardwareVolume();
idle_add(IDLE_MIXER);
}