[Scummvm-git-logs] scummvm master -> 637eedd1cc1dabc809a8e968d7d428a40a1e1457
elasota
noreply at scummvm.org
Sat Jul 2 16:21:21 UTC 2022
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:
637eedd1cc MTROPOLIS: Clean up some obsolete code/comments
Commit: 637eedd1cc1dabc809a8e968d7d428a40a1e1457
https://github.com/scummvm/scummvm/commit/637eedd1cc1dabc809a8e968d7d428a40a1e1457
Author: elasota (ejlasota at gmail.com)
Date: 2022-07-02T12:21:06-04:00
Commit Message:
MTROPOLIS: Clean up some obsolete code/comments
Changed paths:
engines/mtropolis/plugin/standard.cpp
diff --git a/engines/mtropolis/plugin/standard.cpp b/engines/mtropolis/plugin/standard.cpp
index bf88e1e8c91..3ee768b29cd 100644
--- a/engines/mtropolis/plugin/standard.cpp
+++ b/engines/mtropolis/plugin/standard.cpp
@@ -131,8 +131,6 @@ bool MidiParser_MTropolis::processEvent(const EventInfo &info, bool fireEvents)
return MidiParser_SMF::processEvent(info, fireEvents);
}
-// This extends MidiDriver_BASE because we need to intercept commands to modulate the volume
-// separately for each input.
class MidiFilePlayerImpl : public MidiFilePlayer {
public:
explicit MidiFilePlayerImpl(const Common::SharedPtr<MidiCombinerSource> &outputDriver, const Common::SharedPtr<Data::Standard::MidiModifier::EmbeddedFile> &file, uint32 baseTempo, bool hasTempoOverride, double tempoOverride, uint8 volume, bool loop, uint16 mutedTracks);
@@ -151,8 +149,6 @@ public:
void onTimer();
private:
- static double computeTempoScale(double tempo);
-
Common::SharedPtr<Data::Standard::MidiModifier::EmbeddedFile> _file;
Common::SharedPtr<MidiParser_MTropolis> _parser;
Common::SharedPtr<MidiCombinerSource> _outputDriver;
@@ -264,12 +260,6 @@ void MidiFilePlayerImpl::onTimer() {
_parser->onTimer();
}
-double MidiFilePlayerImpl::computeTempoScale(double tempo) {
- if (tempo <= 0.0)
- return 1.0;
- return 120.0 / tempo;
-}
-
// Simple combiner - Behaves "QuickTime-like" and all commands are passed through directly.
// This applies volume by modulating note velocity.
class MidiCombinerSimple;
More information about the Scummvm-git-logs
mailing list