From b3568adcf58d7cb6f3b3bedebfeb21b9ff6089e3 Mon Sep 17 00:00:00 2001 From: Wohlstand Date: Sun, 13 Sep 2020 19:07:16 +0300 Subject: Rename "adldata.hh" into "oplinst.h" --- src/adldata.hh | 121 ----------------------------------------------- src/adlmidi_cvt.hpp | 2 +- src/adlmidi_midiplay.hpp | 2 +- src/adlmidi_opl3.hpp | 4 +- src/adlmidi_private.hpp | 2 +- src/oplinst.h | 121 +++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 126 insertions(+), 126 deletions(-) delete mode 100644 src/adldata.hh create mode 100644 src/oplinst.h (limited to 'src') diff --git a/src/adldata.hh b/src/adldata.hh deleted file mode 100644 index aa96736..0000000 --- a/src/adldata.hh +++ /dev/null @@ -1,121 +0,0 @@ -/* - * libADLMIDI is a free Software MIDI synthesizer library with OPL3 emulation - * - * Original ADLMIDI code: Copyright (c) 2010-2014 Joel Yliluoma - * ADLMIDI Library API: Copyright (c) 2015-2020 Vitaly Novichkov - * - * Library is based on the ADLMIDI, a MIDI player for Linux and Windows with OPL3 emulation: - * http://iki.fi/bisqwit/source/adlmidi.html - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef ADLDATA_H -#define ADLDATA_H - -#include -#include -#include - -#pragma pack(push, 1) -#define ADLDATA_BYTE_COMPARABLE(T) \ - inline bool operator==(const T &a, const T &b) \ - { return !memcmp(&a, &b, sizeof(T)); } \ - inline bool operator!=(const T &a, const T &b) \ - { return !operator==(a, b); } - -/** - * @brief OPL3 Operator data for single tumbre - */ -struct OplTimbre -{ - //! WaveForm, Sustain/Release, AttackDecay, and AM/VIB/EG/KSR/F-Mult settings - uint32_t modulator_E862, carrier_E862; - //! KSL/attenuation settings - uint8_t modulator_40, carrier_40; - //! Feedback/connection bits for the channel - uint8_t feedconn; - //! Semi-tone offset - int8_t noteOffset; -}; -ADLDATA_BYTE_COMPARABLE(struct OplTimbre) - - -enum { OPLNoteOnMaxTime = 40000 }; - - -/** - * @brief Instrument data with operators included - */ -struct OplInstMeta -{ - enum - { - Flag_Pseudo4op = 0x01, - Flag_NoSound = 0x02, - Flag_Real4op = 0x04 - }; - - enum - { - Flag_RM_BassDrum = 0x08, - Flag_RM_Snare = 0x10, - Flag_RM_TomTom = 0x18, - Flag_RM_Cymbal = 0x20, - Flag_RM_HiHat = 0x28, - Mask_RhythmMode = 0x38 - }; - - //! Operator data - OplTimbre op[2]; - //! Fixed note for drum instruments - uint8_t drumTone; - //! Instrument flags - uint8_t flags; - //! Number of milliseconds it produces sound while key on - uint16_t soundKeyOnMs; - //! Number of milliseconds it produces sound while releasing after key off - uint16_t soundKeyOffMs; - //! MIDI velocity offset - int8_t midiVelocityOffset; - //! Second voice detune - double voice2_fine_tune; -}; -ADLDATA_BYTE_COMPARABLE(struct OplInstMeta) - -#undef ADLDATA_BYTE_COMPARABLE -#pragma pack(pop) - -/** - * @brief Bank global setup - */ -struct AdlBankSetup -{ - int volumeModel; - bool deepTremolo; - bool deepVibrato; - bool scaleModulators; -}; - -/** - * @brief Convert external instrument to internal instrument - */ -void cvt_ADLI_to_FMIns(OplInstMeta &dst, const struct ADL_Instrument &src); - -/** - * @brief Convert internal instrument to external instrument - */ -void cvt_FMIns_to_ADLI(struct ADL_Instrument &dst, const OplInstMeta &src); - -#endif //ADLDATA_H diff --git a/src/adlmidi_cvt.hpp b/src/adlmidi_cvt.hpp index de25253..072345c 100644 --- a/src/adlmidi_cvt.hpp +++ b/src/adlmidi_cvt.hpp @@ -21,7 +21,7 @@ * along with this program. If not, see . */ -#include "adldata.hh" +#include "oplinst.h" #include "wopl/wopl_file.h" #include diff --git a/src/adlmidi_midiplay.hpp b/src/adlmidi_midiplay.hpp index 78cd89a..ef54db2 100644 --- a/src/adlmidi_midiplay.hpp +++ b/src/adlmidi_midiplay.hpp @@ -24,7 +24,7 @@ #ifndef ADLMIDI_MIDIPLAY_HPP #define ADLMIDI_MIDIPLAY_HPP -#include "adldata.hh" +#include "oplinst.h" #include "adlmidi_private.hpp" #include "adlmidi_ptr.hpp" #include "structures/pl_list.hpp" diff --git a/src/adlmidi_opl3.hpp b/src/adlmidi_opl3.hpp index 1172a45..c4a2b07 100644 --- a/src/adlmidi_opl3.hpp +++ b/src/adlmidi_opl3.hpp @@ -24,7 +24,7 @@ #ifndef ADLMIDI_OPL3_HPP #define ADLMIDI_OPL3_HPP -#include "adldata.hh" +#include "oplinst.h" #include "adlmidi_ptr.hpp" #include "adlmidi_private.hpp" #include "adlmidi_bankmap.h" @@ -87,7 +87,7 @@ public: //! MIDI bank instruments data BankMap m_insBanks; //! MIDI bank-wide setup - AdlBankSetup m_insBankSetup; + OplBankSetup m_insBankSetup; public: //! Blank instrument template diff --git a/src/adlmidi_private.hpp b/src/adlmidi_private.hpp index 0481a72..9d39222 100644 --- a/src/adlmidi_private.hpp +++ b/src/adlmidi_private.hpp @@ -145,7 +145,7 @@ class OPLChipBase; typedef class OPL3 Synth; -#include "adldata.hh" +#include "oplinst.h" #include "adlmidi_db.h" #define ADLMIDI_BUILD diff --git a/src/oplinst.h b/src/oplinst.h new file mode 100644 index 0000000..a78c6f3 --- /dev/null +++ b/src/oplinst.h @@ -0,0 +1,121 @@ +/* + * libADLMIDI is a free Software MIDI synthesizer library with OPL3 emulation + * + * Original ADLMIDI code: Copyright (c) 2010-2014 Joel Yliluoma + * ADLMIDI Library API: Copyright (c) 2015-2020 Vitaly Novichkov + * + * Library is based on the ADLMIDI, a MIDI player for Linux and Windows with OPL3 emulation: + * http://iki.fi/bisqwit/source/adlmidi.html + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef OPLINST_H +#define OPLINST_H + +#include +#include +#include + +#pragma pack(push, 1) +#define OPLINST_BYTE_COMPARABLE(T) \ + inline bool operator==(const T &a, const T &b) \ + { return !memcmp(&a, &b, sizeof(T)); } \ + inline bool operator!=(const T &a, const T &b) \ + { return !operator==(a, b); } + +/** + * @brief OPL3 Operator data for single tumbre + */ +struct OplTimbre +{ + //! WaveForm, Sustain/Release, AttackDecay, and AM/VIB/EG/KSR/F-Mult settings + uint32_t modulator_E862, carrier_E862; + //! KSL/attenuation settings + uint8_t modulator_40, carrier_40; + //! Feedback/connection bits for the channel + uint8_t feedconn; + //! Semi-tone offset + int8_t noteOffset; +}; +OPLINST_BYTE_COMPARABLE(struct OplTimbre) + + +enum { OPLNoteOnMaxTime = 40000 }; + + +/** + * @brief Instrument data with operators included + */ +struct OplInstMeta +{ + enum + { + Flag_Pseudo4op = 0x01, + Flag_NoSound = 0x02, + Flag_Real4op = 0x04 + }; + + enum + { + Flag_RM_BassDrum = 0x08, + Flag_RM_Snare = 0x10, + Flag_RM_TomTom = 0x18, + Flag_RM_Cymbal = 0x20, + Flag_RM_HiHat = 0x28, + Mask_RhythmMode = 0x38 + }; + + //! Operator data + OplTimbre op[2]; + //! Fixed note for drum instruments + uint8_t drumTone; + //! Instrument flags + uint8_t flags; + //! Number of milliseconds it produces sound while key on + uint16_t soundKeyOnMs; + //! Number of milliseconds it produces sound while releasing after key off + uint16_t soundKeyOffMs; + //! MIDI velocity offset + int8_t midiVelocityOffset; + //! Second voice detune + double voice2_fine_tune; +}; +OPLINST_BYTE_COMPARABLE(struct OplInstMeta) + +#undef OPLINST_BYTE_COMPARABLE +#pragma pack(pop) + +/** + * @brief Bank global setup + */ +struct OplBankSetup +{ + int volumeModel; + bool deepTremolo; + bool deepVibrato; + bool scaleModulators; +}; + +/** + * @brief Convert external instrument to internal instrument + */ +void cvt_ADLI_to_FMIns(OplInstMeta &dst, const struct ADL_Instrument &src); + +/** + * @brief Convert internal instrument to external instrument + */ +void cvt_FMIns_to_ADLI(struct ADL_Instrument &dst, const OplInstMeta &src); + +#endif // OPLINST_H -- cgit v1.2.3