diff options
author | Colin Snover | 2016-11-24 09:24:00 -0600 |
---|---|---|
committer | Colin Snover | 2016-12-16 15:44:29 -0600 |
commit | b8d70d26faea1ed71b0176326c97859b31afb8ef (patch) | |
tree | 89b7cff8de9359e5a7877ac0e4bc6b4212e861f3 /audio/softsynth/mt32/TVA.h | |
parent | ffea222f5bfda8383cb52480b48998c9d0093911 (diff) | |
download | scummvm-rg350-b8d70d26faea1ed71b0176326c97859b31afb8ef.tar.gz scummvm-rg350-b8d70d26faea1ed71b0176326c97859b31afb8ef.tar.bz2 scummvm-rg350-b8d70d26faea1ed71b0176326c97859b31afb8ef.zip |
MT32: Update Munt to 2.0.1-pre
This update uses upstream commit
f88ef828a600ce66d1f730c8fb2a7f580f6f6165.
This update switches to use the new Munt C++ interface, which
will allow ScummVM to link to an external Munt library instead
of requiring it to be built-in in the future. For the moment,
the emulator is still built-in, since it is not available from
most package repositories.
The Munt driver in ScummVM now uses writeSysex instead of the
(now-private) playSysexWithoutFraming, per recommendation from
the Munt team <https://github.com/munt/munt/pull/30>.
This changeset also removes direct modifications that used to be
made to Munt code, to ease future updates. To update Munt code in
the future:
1. Replace all source files in the `softsynth/mt32` directory with
new files from the upstream `mt32emu/src` directory;
2. Update `config.h` with the correct version number for the new
version of Munt;
3. Update `module.mk` to add any new source files that need to be
built.
Diffstat (limited to 'audio/softsynth/mt32/TVA.h')
-rwxr-xr-x[-rw-r--r--] | audio/softsynth/mt32/TVA.h | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/audio/softsynth/mt32/TVA.h b/audio/softsynth/mt32/TVA.h index a100107a69..f593b4e7d1 100644..100755 --- a/audio/softsynth/mt32/TVA.h +++ b/audio/softsynth/mt32/TVA.h @@ -1,5 +1,5 @@ /* Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009 Dean Beeler, Jerome Fisher - * Copyright (C) 2011, 2012, 2013, 2014 Dean Beeler, Jerome Fisher, Sergey V. Mikayev + * Copyright (C) 2011-2016 Dean Beeler, Jerome Fisher, Sergey V. Mikayev * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by @@ -18,9 +18,15 @@ #ifndef MT32EMU_TVA_H #define MT32EMU_TVA_H +#include "globals.h" +#include "Types.h" +#include "Structures.h" + namespace MT32Emu { +class LA32Ramp; class Part; +class Partial; // Note that when entering nextPhase(), newPhase is set to phase + 1, and the descriptions/names below refer to // newPhase's value. @@ -57,7 +63,7 @@ class TVA { private: const Partial * const partial; LA32Ramp *ampRamp; - const MemParams::System * const system_; + const MemParams::System * const system; const Part *part; const TimbreParam::PartialParam *partialParam; @@ -87,8 +93,8 @@ public: bool isPlaying() const; int getPhase() const; -}; +}; // class TVA -} +} // namespace MT32Emu -#endif /* TVA_H_ */ +#endif // #ifndef MT32EMU_TVA_H |