diff options
author | Colin Snover | 2016-11-24 09:24:00 -0600 |
---|---|---|
committer | Colin Snover | 2016-11-25 12:14:13 -0600 |
commit | b4dbd6d3c275097b4be964b7da4478ff930cbaa7 (patch) | |
tree | bb9039cb088654fc93a7048eae799d53b06f3aa9 /audio/softsynth/mt32/ROMInfo.h | |
parent | b5b5c4f341530c41c73cc0d97e7ddae9cbc1d926 (diff) | |
download | scummvm-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/ROMInfo.h')
-rw-r--r-- | audio/softsynth/mt32/ROMInfo.h | 52 |
1 files changed, 21 insertions, 31 deletions
diff --git a/audio/softsynth/mt32/ROMInfo.h b/audio/softsynth/mt32/ROMInfo.h index 4682620a15..8a5ad141b6 100644 --- a/audio/softsynth/mt32/ROMInfo.h +++ b/audio/softsynth/mt32/ROMInfo.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,73 +18,63 @@ #ifndef MT32EMU_ROMINFO_H #define MT32EMU_ROMINFO_H -//#include <cstddef> -#include "common/file.h" +#include <cstddef> -namespace MT32Emu { +#include "globals.h" +#include "File.h" -struct ControlROMFeatureSet; +namespace MT32Emu { // Defines vital info about ROM file to be used by synth and applications struct ROMInfo { public: size_t fileSize; - const char *sha1Digest; + const File::SHA1Digest &sha1Digest; enum Type {PCM, Control, Reverb} type; const char *shortName; const char *description; enum PairType {Full, FirstHalf, SecondHalf, Mux0, Mux1} pairType; ROMInfo *pairROMInfo; - const ControlROMFeatureSet *controlROMFeatures; // Returns a ROMInfo struct by inspecting the size and the SHA1 hash - static const ROMInfo* getROMInfo(Common::File *file); + MT32EMU_EXPORT static const ROMInfo* getROMInfo(File *file); // Currently no-op - static void freeROMInfo(const ROMInfo *romInfo); + MT32EMU_EXPORT static void freeROMInfo(const ROMInfo *romInfo); // Allows retrieving a NULL-terminated list of ROMInfos for a range of types and pairTypes // (specified by bitmasks) // Useful for GUI/console app to output information on what ROMs it supports - static const ROMInfo** getROMInfoList(unsigned int types, unsigned int pairTypes); + MT32EMU_EXPORT static const ROMInfo** getROMInfoList(Bit32u types, Bit32u pairTypes); // Frees the list of ROMInfos given - static void freeROMInfoList(const ROMInfo **romInfos); + MT32EMU_EXPORT static void freeROMInfoList(const ROMInfo **romInfos); }; // Synth::open() is to require a full control ROMImage and a full PCM ROMImage to work class ROMImage { private: - Common::File *file; - const ROMInfo *romInfo; + File * const file; + const ROMInfo * const romInfo; -public: + ROMImage(File *file); + ~ROMImage(); +public: // Creates a ROMImage object given a ROMInfo and a File. Keeps a reference // to the File and ROMInfo given, which must be freed separately by the user // after the ROMImage is freed - static const ROMImage* makeROMImage(Common::File *file); + MT32EMU_EXPORT static const ROMImage* makeROMImage(File *file); // Must only be done after all Synths using the ROMImage are deleted - static void freeROMImage(const ROMImage *romImage); + MT32EMU_EXPORT static void freeROMImage(const ROMImage *romImage); - Common::File *getFile() const; - const ROMInfo *getROMInfo() const; -}; - -struct ControlROMFeatureSet { -private: - unsigned int defaultReverbMT32Compatible : 1; - unsigned int oldMT32AnalogLPF : 1; - -public: - ControlROMFeatureSet(bool defaultReverbMT32Compatible, bool oldMT32AnalogLPF); - bool isDefaultReverbMT32Compatible() const; - bool isOldMT32AnalogLPF() const; + MT32EMU_EXPORT File *getFile() const; + MT32EMU_EXPORT const ROMInfo *getROMInfo() const; }; -} +} // namespace MT32Emu -#endif +#endif // #ifndef MT32EMU_ROMINFO_H |