mixer/Control: move some code to Lock*() methods

This commit is contained in:
Max Kellermann
2022-08-18 14:29:07 +02:00
parent b0873fbc90
commit 29eb3e9ebc
11 changed files with 155 additions and 144 deletions
+2 -4
View File
@@ -19,6 +19,7 @@
#include "NullMixerListener.hxx"
#include "mixer/Control.hxx"
#include "mixer/Mixer.hxx"
#include "mixer/plugins/AlsaMixerPlugin.hxx"
#include "filter/Registry.hxx"
#include "event/Loop.hxx"
@@ -57,10 +58,7 @@ try {
mixer_listener,
ConfigBlock());
mixer_open(*mixer);
volume = mixer_get_volume(*mixer);
mixer_close(*mixer);
volume = mixer->LockGetVolume();
mixer_free(mixer);
assert(volume >= -1 && volume <= 100);
-6
View File
@@ -42,12 +42,6 @@
#include <stdlib.h>
#include <stdio.h>
void
mixer_set_volume([[maybe_unused]] Mixer &mixer,
[[maybe_unused]] unsigned volume)
{
}
static std::unique_ptr<PreparedFilter>
LoadFilter(const ConfigData &config, const char *name)
{