From b4dbd6d3c275097b4be964b7da4478ff930cbaa7 Mon Sep 17 00:00:00 2001
From: Colin Snover
Date: Thu, 24 Nov 2016 09:24:00 -0600
Subject: 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`.
---
 audio/softsynth/mt32/TVP.h | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'audio/softsynth/mt32/TVP.h')

diff --git a/audio/softsynth/mt32/TVP.h b/audio/softsynth/mt32/TVP.h
index e9d05ffa7a..be90f0ff08 100644
--- a/audio/softsynth/mt32/TVP.h
+++ b/audio/softsynth/mt32/TVP.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,12 +18,19 @@
 #ifndef MT32EMU_TVP_H
 #define MT32EMU_TVP_H
 
+#include "globals.h"
+#include "Types.h"
+#include "Structures.h"
+
 namespace MT32Emu {
 
+class Part;
+class Partial;
+
 class TVP {
 private:
 	const Partial * const partial;
-	const MemParams::System * const system_; // FIXME: Only necessary because masterTune calculation is done in the wrong place atm.
+	const MemParams::System * const system; // FIXME: Only necessary because masterTune calculation is done in the wrong place atm.
 
 	const Part *part;
 	const TimbreParam::PartialParam *partialParam;
@@ -60,8 +67,8 @@ public:
 	Bit32u getBasePitch() const;
 	Bit16u nextPitch();
 	void startDecay();
-};
+}; // class TVP
 
-}
+} // namespace MT32Emu
 
-#endif
+#endif // #ifndef MT32EMU_TVP_H
-- 
cgit v1.2.3