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/File.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/File.h')
-rwxr-xr-x | audio/softsynth/mt32/File.h | 73 |
1 files changed, 73 insertions, 0 deletions
diff --git a/audio/softsynth/mt32/File.h b/audio/softsynth/mt32/File.h new file mode 100755 index 0000000000..c9a7d582b4 --- /dev/null +++ b/audio/softsynth/mt32/File.h @@ -0,0 +1,73 @@ +/* Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009 Dean Beeler, Jerome Fisher + * 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 + * the Free Software Foundation, either version 2.1 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef MT32EMU_FILE_H +#define MT32EMU_FILE_H + +#include <cstddef> + +#include "globals.h" +#include "Types.h" + +namespace MT32Emu { + +class MT32EMU_EXPORT File { +public: + // Includes terminator char. + typedef char SHA1Digest[41]; + + virtual ~File() {} + virtual size_t getSize() = 0; + virtual const Bit8u *getData() = 0; + virtual const SHA1Digest &getSHA1() = 0; + + virtual void close() = 0; +}; + +class MT32EMU_EXPORT AbstractFile : public File { +public: + const SHA1Digest &getSHA1(); + +protected: + AbstractFile(); + AbstractFile(const SHA1Digest &sha1Digest); + +private: + bool sha1DigestCalculated; + SHA1Digest sha1Digest; + + // Binary compatibility helper. + void *reserved; +}; + +class MT32EMU_EXPORT ArrayFile : public AbstractFile { +public: + ArrayFile(const Bit8u *data, size_t size); + ArrayFile(const Bit8u *data, size_t size, const SHA1Digest &sha1Digest); + + size_t getSize(); + const Bit8u *getData(); + void close() {} + +private: + const Bit8u *data; + size_t size; +}; + +} // namespace MT32Emu + +#endif // #ifndef MT32EMU_FILE_H |