[Scummvm-cvs-logs] scummvm master -> 1eb10b1a468ba65014168e28c8340e45b2b19b5f

[lordhoto]

This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
5ea87462e4 AUDIO: Register MT-32 emulator as plain sound type.
d99f23fb10 AUDIO: Register FluidSynth driver as plain sound type.
1eb10b1a46 AUDIO: Register EAS sound driver as plain sound type.


Commit: 5ea87462e4d4959cd903229d380f186f89b37644
    https://github.com/scummvm/scummvm/commit/5ea87462e4d4959cd903229d380f186f89b37644
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2014-01-16T13:18:47-08:00

Commit Message:
AUDIO: Register MT-32 emulator as plain sound type.

Formerly the audio stream was registered as sfx. This is incorrect behavior
since the client code will control music volume with MIDI events on its own.
It seems 67b311713d8f4cfcd460a9649e0075f24278a048 introduced this very long
ago.

This should fix unintended coupling of sfx volume and music volume in BASS.

Changed paths:
    audio/softsynth/mt32.cpp



diff --git a/audio/softsynth/mt32.cpp b/audio/softsynth/mt32.cpp
index 2a90b58..4824761 100644
--- a/audio/softsynth/mt32.cpp
+++ b/audio/softsynth/mt32.cpp
@@ -230,7 +230,7 @@ int MidiDriver_MT32::open() {
 
 	g_system->updateScreen();
 
-	_mixer->playStream(Audio::Mixer::kSFXSoundType, &_mixerSoundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
+	_mixer->playStream(Audio::Mixer::kPlainSoundType, &_mixerSoundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
 
 	return 0;
 }


Commit: d99f23fb109043a7457bd68c82dd6b5a756fa3d8
    https://github.com/scummvm/scummvm/commit/d99f23fb109043a7457bd68c82dd6b5a756fa3d8
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2014-01-16T13:20:23-08:00

Commit Message:
AUDIO: Register FluidSynth driver as plain sound type.

MIDI code will control volume via MIDI events thus the generated audio should
not be affected by mixer sound volumes.

The initial commit(s) in d4d045b1174b4a48659f39f026ade42684b679bf /
13dc149ded691e718905049990dd0220230c500e added it as music sound type.
So, this seems to be a long standing issue.

Changed paths:
    audio/softsynth/fluidsynth.cpp



diff --git a/audio/softsynth/fluidsynth.cpp b/audio/softsynth/fluidsynth.cpp
index efcf1be..218a06e 100644
--- a/audio/softsynth/fluidsynth.cpp
+++ b/audio/softsynth/fluidsynth.cpp
@@ -184,8 +184,7 @@ int MidiDriver_FluidSynth::open() {
 
 	MidiDriver_Emulated::open();
 
-	// The MT-32 emulator uses kSFXSoundType here. I don't know why.
-	_mixer->playStream(Audio::Mixer::kMusicSoundType, &_mixerSoundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
+	_mixer->playStream(Audio::Mixer::kPlainSoundType, &_mixerSoundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
 	return 0;
 }
 


Commit: 1eb10b1a468ba65014168e28c8340e45b2b19b5f
    https://github.com/scummvm/scummvm/commit/1eb10b1a468ba65014168e28c8340e45b2b19b5f
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2014-01-16T13:21:39-08:00

Commit Message:
AUDIO: Register EAS sound driver as plain sound type.

MIDI code will control volume via MIDI events thus the generated audio should
not be affected by mixer sound volumes.

The initial commit 0e6cdfd67580f75e912c5e92abb26821d032f74b added it as music
sound type. Might be copied from the (also) incorrect FluidSynth code.

Changed paths:
    audio/softsynth/eas.cpp



diff --git a/audio/softsynth/eas.cpp b/audio/softsynth/eas.cpp
index ea79b25..0631df2 100644
--- a/audio/softsynth/eas.cpp
+++ b/audio/softsynth/eas.cpp
@@ -305,7 +305,7 @@ int MidiDriver_EAS::open() {
 		warning("error opening EAS dump file");
 #endif
 
-	g_system->getMixer()->playStream(Audio::Mixer::kMusicSoundType,
+	g_system->getMixer()->playStream(Audio::Mixer::kPlainSoundType,
 										&_soundHandle, this, -1,
 										Audio::Mixer::kMaxChannelVolume, 0,
 										DisposeAfterUse::NO, true);