Merge branch 'v0.23.x'

src/lib/xiph/OggSyncState.cxx

@@ -67,7 +67,7 @@ OggSyncState::ExpectPageIn(ogg_stream_state &os)
 bool
 OggSyncState::ExpectPageSeek(ogg_page &page)
 {
-	size_t remaining_skipped = 32768;
+	size_t remaining_skipped = 65536;
 
 	while (true) {
 		int r = ogg_sync_pageseek(&oy, &page);

src/mixer/MixerAll.cxx

@@ -34,13 +34,15 @@ gcc_pure
 static int
 output_mixer_get_volume(const AudioOutputControl &ao) noexcept
 {
-	if (!ao.IsEnabled())
-		return -1;
-
 	auto *mixer = ao.GetMixer();
 	if (mixer == nullptr)
 		return -1;
 
+	/* software mixers are always considered, even if they are
+	   disabled */
+	if (!ao.IsEnabled() && !mixer->IsPlugin(software_mixer_plugin))
+		return -1;
+
 	try {
 		return mixer_get_volume(mixer);
 	} catch (...) {
@@ -76,13 +78,15 @@ output_mixer_set_volume(AudioOutputControl &ao, unsigned volume) noexcept
 {
 	assert(volume <= 100);
 
-	if (!ao.IsEnabled())
-		return false;
-
 	auto *mixer = ao.GetMixer();
 	if (mixer == nullptr)
 		return false;
 
+	/* software mixers are always updated, even if they are
+	   disabled */
+	if (!ao.IsEnabled() && !mixer->IsPlugin(software_mixer_plugin))
+		return false;
+
 	try {
 		mixer_set_volume(mixer, volume);
 		return true;