aboutsummaryrefslogtreecommitdiff
path: root/audio/softsynth/mt32/TVA.h
diff options
context:
space:
mode:
authorColin Snover2016-11-24 09:24:00 -0600
committerColin Snover2016-11-25 12:14:13 -0600
commitb4dbd6d3c275097b4be964b7da4478ff930cbaa7 (patch)
treebb9039cb088654fc93a7048eae799d53b06f3aa9 /audio/softsynth/mt32/TVA.h
parentb5b5c4f341530c41c73cc0d97e7ddae9cbc1d926 (diff)
downloadscummvm-rg350-b4dbd6d3c275097b4be964b7da4478ff930cbaa7.tar.gz
scummvm-rg350-b4dbd6d3c275097b4be964b7da4478ff930cbaa7.tar.bz2
scummvm-rg350-b4dbd6d3c275097b4be964b7da4478ff930cbaa7.zip
MT32: Update Munt to 2.0.0
This changeset also removes unnecessary direct modifications to Munt code to ease future updates. To update Munt 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 match the list of sources given in `mt32emu/CMakeLists.txt libmt32emu_SOURCES`.
Diffstat (limited to 'audio/softsynth/mt32/TVA.h')
-rw-r--r--audio/softsynth/mt32/TVA.h16
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
--- 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