[Scummvm-git-logs] scummvm master -> 96efdb5575110a9463a85c434851ae5fc8d243d2
criezy
criezy at scummvm.org
Fri Aug 21 00:10:12 UTC 2020
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
96efdb5575 SCI: Fix compilation of template MidiPlayer classes
Commit: 96efdb5575110a9463a85c434851ae5fc8d243d2
https://github.com/scummvm/scummvm/commit/96efdb5575110a9463a85c434851ae5fc8d243d2
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2020-08-21T01:09:47+01:00
Commit Message:
SCI: Fix compilation of template MidiPlayer classes
Changed paths:
engines/sci/sound/drivers/amigamac0.cpp
engines/sci/sound/drivers/amigamac1.cpp
diff --git a/engines/sci/sound/drivers/amigamac0.cpp b/engines/sci/sound/drivers/amigamac0.cpp
index 6e2351777f..5eaf039f10 100644
--- a/engines/sci/sound/drivers/amigamac0.cpp
+++ b/engines/sci/sound/drivers/amigamac0.cpp
@@ -388,7 +388,7 @@ private:
MidiPlayer_Mac0::MidiPlayer_Mac0(SciVersion version, Audio::Mixer *mixer, Mixer_Mac<MidiPlayer_Mac0>::Mode mode) :
MidiPlayer_AmigaMac0(version, mixer),
- Mixer_Mac(mode) {
+ Mixer_Mac<MidiPlayer_Mac0>(mode) {
for (uint i = 0; i < kStepTableSize; ++i)
_stepTable[i] = round(0x2000 * pow(2.0, i / 12.0));
diff --git a/engines/sci/sound/drivers/amigamac1.cpp b/engines/sci/sound/drivers/amigamac1.cpp
index 217a447d48..7c9dbaea2d 100644
--- a/engines/sci/sound/drivers/amigamac1.cpp
+++ b/engines/sci/sound/drivers/amigamac1.cpp
@@ -904,7 +904,7 @@ private:
MidiPlayer_Mac1::MidiPlayer_Mac1(SciVersion version, Audio::Mixer *mixer, Mixer_Mac<MidiPlayer_Mac1>::Mode mode) :
MidiPlayer_AmigaMac1(version, mixer, 1480, false),
- Mixer_Mac(mode) {}
+ Mixer_Mac<MidiPlayer_Mac1>(mode) {}
int MidiPlayer_Mac1::open(ResourceManager *resMan) {
if (_isOpen)
More information about the Scummvm-git-logs
mailing list