diff options
| -rw-r--r-- | src/adlmidi_cvt.hpp | 2 | ||||
| -rw-r--r-- | src/adlmidi_midiplay.hpp | 2 | ||||
| -rw-r--r-- | src/adlmidi_opl3.hpp | 4 | ||||
| -rw-r--r-- | src/adlmidi_private.hpp | 2 | ||||
| -rw-r--r-- | src/oplinst.h (renamed from src/adldata.hh) | 16 |
5 files changed, 13 insertions, 13 deletions
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 <http://www.gnu.org/licenses/>. */ -#include "adldata.hh" +#include "oplinst.h" #include "wopl/wopl_file.h" #include <cmath> 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/adldata.hh b/src/oplinst.h index aa96736..a78c6f3 100644 --- a/src/adldata.hh +++ b/src/oplinst.h @@ -21,15 +21,15 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef ADLDATA_H -#define ADLDATA_H +#ifndef OPLINST_H +#define OPLINST_H #include <string.h> #include <stdint.h> #include <cstring> #pragma pack(push, 1) -#define ADLDATA_BYTE_COMPARABLE(T) \ +#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) \ @@ -49,7 +49,7 @@ struct OplTimbre //! Semi-tone offset int8_t noteOffset; }; -ADLDATA_BYTE_COMPARABLE(struct OplTimbre) +OPLINST_BYTE_COMPARABLE(struct OplTimbre) enum { OPLNoteOnMaxTime = 40000 }; @@ -92,15 +92,15 @@ struct OplInstMeta //! Second voice detune double voice2_fine_tune; }; -ADLDATA_BYTE_COMPARABLE(struct OplInstMeta) +OPLINST_BYTE_COMPARABLE(struct OplInstMeta) -#undef ADLDATA_BYTE_COMPARABLE +#undef OPLINST_BYTE_COMPARABLE #pragma pack(pop) /** * @brief Bank global setup */ -struct AdlBankSetup +struct OplBankSetup { int volumeModel; bool deepTremolo; @@ -118,4 +118,4 @@ void cvt_ADLI_to_FMIns(OplInstMeta &dst, const struct ADL_Instrument &src); */ void cvt_FMIns_to_ADLI(struct ADL_Instrument &dst, const OplInstMeta &src); -#endif //ADLDATA_H +#endif // OPLINST_H |