diff options
| author | Colin Snover | 2016-11-25 12:24:08 -0600 |
|---|---|---|
| committer | Colin Snover | 2016-11-25 12:24:08 -0600 |
| commit | df4a503622a524ad8ef47e1c325ac4a711549921 (patch) | |
| tree | 29ac9e6d51fd4cd17e4ebe9d1f66ff93abd0cd9d /audio/softsynth/mt32/TVA.h | |
| parent | b4dbd6d3c275097b4be964b7da4478ff930cbaa7 (diff) | |
| download | scummvm-rg350-df4a503622a524ad8ef47e1c325ac4a711549921.tar.gz scummvm-rg350-df4a503622a524ad8ef47e1c325ac4a711549921.tar.bz2 scummvm-rg350-df4a503622a524ad8ef47e1c325ac4a711549921.zip | |
Revert "MT32: Update Munt to 2.0.0"
This reverts commit b4dbd6d3c275097b4be964b7da4478ff930cbaa7.
Diffstat (limited to 'audio/softsynth/mt32/TVA.h')
| -rw-r--r-- | audio/softsynth/mt32/TVA.h | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/audio/softsynth/mt32/TVA.h b/audio/softsynth/mt32/TVA.h index f593b4e7d1..a100107a69 100644 --- 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-2016 Dean Beeler, Jerome Fisher, Sergey V. Mikayev + * Copyright (C) 2011, 2012, 2013, 2014 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,15 +18,9 @@ #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. @@ -63,7 +57,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; @@ -93,8 +87,8 @@ public: bool isPlaying() const; int getPhase() const; -}; // class TVA +}; -} // namespace MT32Emu +} -#endif // #ifndef MT32EMU_TVA_H +#endif /* TVA_H_ */ |