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/Partial.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/Partial.h')
-rw-r--r-- | audio/softsynth/mt32/Partial.h | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/audio/softsynth/mt32/Partial.h b/audio/softsynth/mt32/Partial.h index 187665de51..749468135d 100644 --- a/audio/softsynth/mt32/Partial.h +++ b/audio/softsynth/mt32/Partial.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,21 +18,11 @@ #ifndef MT32EMU_PARTIAL_H #define MT32EMU_PARTIAL_H -#include "globals.h" -#include "internals.h" -#include "Types.h" -#include "Structures.h" -#include "LA32Ramp.h" -#include "LA32WaveGenerator.h" - namespace MT32Emu { -class Part; -class Poly; class Synth; +class Part; class TVA; -class TVF; -class TVP; struct ControlROMPCMStruct; // A partial represents one of up to four waveform generators currently playing within a poly. @@ -42,7 +32,7 @@ private: const int debugPartialNum; // Only used for debugging // Number of the sample currently being rendered by produceOutput(), or 0 if no run is in progress // This is only kept available for debugging purposes. - Bit32u sampleNum; + unsigned long sampleNum; // Actually, this is a 4-bit register but we abuse this to emulate inverted mixing. // Also we double the value to enable INACCURATE_SMOOTH_PAN, with respect to MoK. @@ -87,7 +77,7 @@ public: ~Partial(); int debugGetPartialNum() const; - Bit32u debugGetSampleNum() const; + unsigned long debugGetSampleNum() const; int getOwnerPart() const; const Poly *getPoly() const; @@ -110,9 +100,9 @@ public: // Returns true only if data written to buffer // This function (unlike the one below it) returns processed stereo samples // made from combining this single partial with its pair, if it has one. - bool produceOutput(Sample *leftBuf, Sample *rightBuf, Bit32u length); -}; // class Partial + bool produceOutput(Sample *leftBuf, Sample *rightBuf, unsigned long length); +}; -} // namespace MT32Emu +} -#endif // #ifndef MT32EMU_PARTIAL_H +#endif |