Merge branch 'v0.23.x'

2022-08-08 23:46:22 +02:00
parent 0279f4fb57 69f741e8a6
commit b789ffd2bf
19 changed files with 234 additions and 149 deletions
--- a/src/Partition.hxx
+++ b/src/Partition.hxx
@@ -25,6 +25,7 @@
 #include "queue/Listener.hxx"
 #include "output/MultipleOutputs.hxx"
 #include "mixer/Listener.hxx"
+#include "mixer/Memento.hxx"
 #include "player/Control.hxx"
 #include "player/Listener.hxx"
 #include "protocol/RangeArg.hxx"
@@ -79,6 +80,8 @@ struct Partition final : QueueListener, PlayerListener, MixerListener {

 	MultipleOutputs outputs;

+	MixerMemento mixer_memento;
+
 	PlayerControl pc;

 	ReplayGainMode replay_gain_mode = ReplayGainMode::OFF;