diff options
author | Colin Snover | 2016-11-24 09:24:00 -0600 |
---|---|---|
committer | Colin Snover | 2016-12-16 15:44:29 -0600 |
commit | b8d70d26faea1ed71b0176326c97859b31afb8ef (patch) | |
tree | 89b7cff8de9359e5a7877ac0e4bc6b4212e861f3 /audio/softsynth/mt32/mt32emu.h | |
parent | ffea222f5bfda8383cb52480b48998c9d0093911 (diff) | |
download | scummvm-rg350-b8d70d26faea1ed71b0176326c97859b31afb8ef.tar.gz scummvm-rg350-b8d70d26faea1ed71b0176326c97859b31afb8ef.tar.bz2 scummvm-rg350-b8d70d26faea1ed71b0176326c97859b31afb8ef.zip |
MT32: Update Munt to 2.0.1-pre
This update uses upstream commit
f88ef828a600ce66d1f730c8fb2a7f580f6f6165.
This update switches to use the new Munt C++ interface, which
will allow ScummVM to link to an external Munt library instead
of requiring it to be built-in in the future. For the moment,
the emulator is still built-in, since it is not available from
most package repositories.
The Munt driver in ScummVM now uses writeSysex instead of the
(now-private) playSysexWithoutFraming, per recommendation from
the Munt team <https://github.com/munt/munt/pull/30>.
This changeset also removes direct modifications that used to be
made to Munt code, to ease future updates. To update Munt code 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 add any new source files that need to be
built.
Diffstat (limited to 'audio/softsynth/mt32/mt32emu.h')
-rwxr-xr-x[-rw-r--r--] | audio/softsynth/mt32/mt32emu.h | 96 |
1 files changed, 59 insertions, 37 deletions
diff --git a/audio/softsynth/mt32/mt32emu.h b/audio/softsynth/mt32/mt32emu.h index 1574c08f0d..9f2b058250 100644..100755 --- a/audio/softsynth/mt32/mt32emu.h +++ b/audio/softsynth/mt32/mt32emu.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,44 +18,66 @@ #ifndef MT32EMU_MT32EMU_H #define MT32EMU_MT32EMU_H -// Configuration - -// 0: Use 16-bit signed samples and refined wave generator based on logarithmic fixed-point computations and LUTs. Maximum emulation accuracy and speed. -// 1: Use float samples in the wave generator and renderer. Maximum output quality and minimum noise. -#define MT32EMU_USE_FLOAT_SAMPLES 0 - -namespace MT32Emu -{ -// Sample rate to use in mixing. With the progress of development, we've found way too many thing dependent. -// In order to achieve further advance in emulation accuracy, sample rate made fixed throughout the emulator, -// except the emulation of analogue path. -// The output from the synth is supposed to be resampled externally in order to convert to the desired sample rate. -const unsigned int SAMPLE_RATE = 32000; - -// The default value for the maximum number of partials playing simultaneously. -const unsigned int DEFAULT_MAX_PARTIALS = 32; - -// The higher this number, the more memory will be used, but the more samples can be processed in one run - -// various parts of sample generation can be processed more efficiently in a single run. -// A run's maximum length is that given to Synth::render(), so giving a value here higher than render() is ever -// called with will give no gain (but simply waste the memory). -// Note that this value does *not* in any way impose limitations on the length given to render(), and has no effect -// on the generated audio. -// This value must be >= 1. -const unsigned int MAX_SAMPLES_PER_RUN = 4096; - -// The default size of the internal MIDI event queue. -// It holds the incoming MIDI events before the rendering engine actually processes them. -// The main goal is to fairly emulate the real hardware behaviour which obviously -// uses an internal MIDI event queue to gather incoming data as well as the delays -// introduced by transferring data via the MIDI interface. -// This also facilitates building of an external rendering loop -// as the queue stores timestamped MIDI events. -const unsigned int DEFAULT_MIDI_EVENT_QUEUE_SIZE = 1024; -} +#include "config.h" + +/* API Configuration */ + +/* 0: Use full-featured C++ API. Well suitable when the library is to be linked statically. + * When the library is shared, ABI compatibility may be an issue. Therefore, it should + * only be used within a project comprising of several modules to share the library code. + * 1: Use C-compatible API. Make the library looks as a regular C library with well-defined ABI. + * This is also crucial when the library is to be linked with modules in a different + * language, either statically or dynamically. + * 2: Use plugin-like API via C-interface wrapped in a C++ class. This is mainly intended + * for a shared library being dynamically loaded in run-time. To get access to all the library + * services, a client application only needs to bind with a single factory function. + * 3: Use optimised C++ API compatible with the plugin API (type 2). The facade class also wraps + * the C functions but they are invoked directly. This enables the compiler to generate better + * code for the library when linked statically yet being consistent with the plugin-like API. + */ + +#ifdef MT32EMU_API_TYPE +#if MT32EMU_API_TYPE == 0 && (MT32EMU_EXPORTS_TYPE == 1 || MT32EMU_EXPORTS_TYPE == 2) +#error Incompatible setting MT32EMU_API_TYPE=0 +#elif MT32EMU_API_TYPE == 1 && (MT32EMU_EXPORTS_TYPE == 0 || MT32EMU_EXPORTS_TYPE == 2) +#error Incompatible setting MT32EMU_API_TYPE=1 +#elif MT32EMU_API_TYPE == 2 && (MT32EMU_EXPORTS_TYPE == 0) +#error Incompatible setting MT32EMU_API_TYPE=2 +#elif MT32EMU_API_TYPE == 3 && (MT32EMU_EXPORTS_TYPE == 0) +#error Incompatible setting MT32EMU_API_TYPE=3 +#endif +#else /* #ifdef MT32EMU_API_TYPE */ +#if 0 < MT32EMU_EXPORTS_TYPE && MT32EMU_EXPORTS_TYPE < 3 +#define MT32EMU_API_TYPE MT32EMU_EXPORTS_TYPE +#else +#define MT32EMU_API_TYPE 0 +#endif +#endif /* #ifdef MT32EMU_API_TYPE */ + +/* MT32EMU_SHARED should be defined when building shared library, especially for Windows platforms. */ +/* +#define MT32EMU_SHARED +*/ + +#include "globals.h" + +#if !defined(__cplusplus) || MT32EMU_API_TYPE == 1 + +#include "c_interface/c_interface.h" + +#elif MT32EMU_API_TYPE == 2 || MT32EMU_API_TYPE == 3 + +#include "c_interface/cpp_interface.h" + +#else /* #if !defined(__cplusplus) || MT32EMU_API_TYPE == 1 */ #include "Types.h" +#include "File.h" +#include "FileStream.h" #include "ROMInfo.h" #include "Synth.h" +#include "MidiStreamParser.h" -#endif +#endif /* #if !defined(__cplusplus) || MT32EMU_API_TYPE == 1 */ + +#endif /* #ifndef MT32EMU_MT32EMU_H */ |