diff options
author | Tarek Soliman | 2017-12-23 15:40:30 -0600 |
---|---|---|
committer | Tarek Soliman | 2018-01-03 10:40:23 -0600 |
commit | 50d79c5f265aad592ae7f17209653ccbb1fde488 (patch) | |
tree | 1951526e3ff2910acb0588f3a23ba0e9e7e66544 /audio/softsynth/mt32/srchelper/srctools/include | |
parent | bb5e8d3a11711d409f89739cf3f054cd5bac8c4f (diff) | |
download | scummvm-rg350-50d79c5f265aad592ae7f17209653ccbb1fde488.tar.gz scummvm-rg350-50d79c5f265aad592ae7f17209653ccbb1fde488.tar.bz2 scummvm-rg350-50d79c5f265aad592ae7f17209653ccbb1fde488.zip |
MT32: Update to munt 2.3.0
This uses upstream commit 939cc986d9ffd044f8c6149361127ad5d94e430f
Closes gh-1091
Diffstat (limited to 'audio/softsynth/mt32/srchelper/srctools/include')
7 files changed, 23 insertions, 23 deletions
diff --git a/audio/softsynth/mt32/srchelper/srctools/include/FIRResampler.h b/audio/softsynth/mt32/srchelper/srctools/include/FIRResampler.h index 2c5d69052a..7c09bf8ded 100644 --- a/audio/softsynth/mt32/srchelper/srctools/include/FIRResampler.h +++ b/audio/softsynth/mt32/srchelper/srctools/include/FIRResampler.h @@ -14,8 +14,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef FIR_RESAMPLER_H -#define FIR_RESAMPLER_H +#ifndef SRCTOOLS_FIR_RESAMPLER_H +#define SRCTOOLS_FIR_RESAMPLER_H #include "ResamplerStage.h" @@ -64,4 +64,4 @@ private: } // namespace SRCTools -#endif // FIR_RESAMPLER_H +#endif // SRCTOOLS_FIR_RESAMPLER_H diff --git a/audio/softsynth/mt32/srchelper/srctools/include/FloatSampleProvider.h b/audio/softsynth/mt32/srchelper/srctools/include/FloatSampleProvider.h index 03038d03ec..9820769f7f 100644 --- a/audio/softsynth/mt32/srchelper/srctools/include/FloatSampleProvider.h +++ b/audio/softsynth/mt32/srchelper/srctools/include/FloatSampleProvider.h @@ -14,8 +14,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef FLOAT_SAMPLE_PROVIDER_H -#define FLOAT_SAMPLE_PROVIDER_H +#ifndef SRCTOOLS_FLOAT_SAMPLE_PROVIDER_H +#define SRCTOOLS_FLOAT_SAMPLE_PROVIDER_H namespace SRCTools { @@ -24,11 +24,11 @@ typedef float FloatSample; /** Interface defines an abstract source of samples. It can either define a single channel stream or a stream with interleaved channels. */ class FloatSampleProvider { public: - virtual ~FloatSampleProvider() {}; + virtual ~FloatSampleProvider() {} virtual void getOutputSamples(FloatSample *outBuffer, unsigned int size) = 0; }; } // namespace SRCTools -#endif // FLOAT_SAMPLE_PROVIDER_H +#endif // SRCTOOLS_FLOAT_SAMPLE_PROVIDER_H diff --git a/audio/softsynth/mt32/srchelper/srctools/include/IIR2xResampler.h b/audio/softsynth/mt32/srchelper/srctools/include/IIR2xResampler.h index 23733e4049..0bfe1c4c8b 100644 --- a/audio/softsynth/mt32/srchelper/srctools/include/IIR2xResampler.h +++ b/audio/softsynth/mt32/srchelper/srctools/include/IIR2xResampler.h @@ -14,8 +14,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef IIR_2X_RESAMPLER_H -#define IIR_2X_RESAMPLER_H +#ifndef SRCTOOLS_IIR_2X_RESAMPLER_H +#define SRCTOOLS_IIR_2X_RESAMPLER_H #include "ResamplerStage.h" @@ -97,4 +97,4 @@ public: } // namespace SRCTools -#endif // IIR_2X_RESAMPLER_H +#endif // SRCTOOLS_IIR_2X_RESAMPLER_H diff --git a/audio/softsynth/mt32/srchelper/srctools/include/LinearResampler.h b/audio/softsynth/mt32/srchelper/srctools/include/LinearResampler.h index 1f4dd2fcbd..c81ff2a385 100644 --- a/audio/softsynth/mt32/srchelper/srctools/include/LinearResampler.h +++ b/audio/softsynth/mt32/srchelper/srctools/include/LinearResampler.h @@ -14,8 +14,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef LINEAR_RESAMPLER_H -#define LINEAR_RESAMPLER_H +#ifndef SRCTOOLS_LINEAR_RESAMPLER_H +#define SRCTOOLS_LINEAR_RESAMPLER_H #include "ResamplerStage.h" @@ -39,4 +39,4 @@ private: } // namespace SRCTools -#endif // LINEAR_RESAMPLER_H +#endif // SRCTOOLS_LINEAR_RESAMPLER_H diff --git a/audio/softsynth/mt32/srchelper/srctools/include/ResamplerModel.h b/audio/softsynth/mt32/srchelper/srctools/include/ResamplerModel.h index 0372605e87..f0ac237071 100644 --- a/audio/softsynth/mt32/srchelper/srctools/include/ResamplerModel.h +++ b/audio/softsynth/mt32/srchelper/srctools/include/ResamplerModel.h @@ -14,8 +14,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef RESAMPLER_MODEL_H -#define RESAMPLER_MODEL_H +#ifndef SRCTOOLS_RESAMPLER_MODEL_H +#define SRCTOOLS_RESAMPLER_MODEL_H #include "FloatSampleProvider.h" @@ -60,4 +60,4 @@ void freeResamplerModel(FloatSampleProvider &model, FloatSampleProvider &source) } // namespace SRCTools -#endif // RESAMPLER_MODEL_H +#endif // SRCTOOLS_RESAMPLER_MODEL_H diff --git a/audio/softsynth/mt32/srchelper/srctools/include/ResamplerStage.h b/audio/softsynth/mt32/srchelper/srctools/include/ResamplerStage.h index c0f0a0a50a..e335c0c380 100644 --- a/audio/softsynth/mt32/srchelper/srctools/include/ResamplerStage.h +++ b/audio/softsynth/mt32/srchelper/srctools/include/ResamplerStage.h @@ -14,8 +14,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef RESAMPLER_STAGE_H -#define RESAMPLER_STAGE_H +#ifndef SRCTOOLS_RESAMPLER_STAGE_H +#define SRCTOOLS_RESAMPLER_STAGE_H #include "FloatSampleProvider.h" @@ -24,7 +24,7 @@ namespace SRCTools { /** Interface defines an abstract source of samples. It can either define a single channel stream or a stream with interleaved channels. */ class ResamplerStage { public: - virtual ~ResamplerStage() {}; + virtual ~ResamplerStage() {} /** Returns a lower estimation of required number of input samples to produce the specified number of output samples. */ virtual unsigned int estimateInLength(const unsigned int outLength) const = 0; @@ -35,4 +35,4 @@ public: } // namespace SRCTools -#endif // RESAMPLER_STAGE_H +#endif // SRCTOOLS_RESAMPLER_STAGE_H diff --git a/audio/softsynth/mt32/srchelper/srctools/include/SincResampler.h b/audio/softsynth/mt32/srchelper/srctools/include/SincResampler.h index ea3f03b112..1551a1eda8 100644 --- a/audio/softsynth/mt32/srchelper/srctools/include/SincResampler.h +++ b/audio/softsynth/mt32/srchelper/srctools/include/SincResampler.h @@ -14,8 +14,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef SINC_RESAMPLER_H -#define SINC_RESAMPLER_H +#ifndef SRCTOOLS_SINC_RESAMPLER_H +#define SRCTOOLS_SINC_RESAMPLER_H #include "FIRResampler.h" @@ -43,4 +43,4 @@ namespace SincResampler { } // namespace SRCTools -#endif // SINC_RESAMPLER_H +#endif // SRCTOOLS_SINC_RESAMPLER_H |