diff options
| -rw-r--r-- | src/adlmidi_midiplay.cpp | 6 | ||||
| -rw-r--r-- | src/adlmidi_private.hpp | 8 | ||||
| -rw-r--r-- | src/adlmidi_sequencer.cpp | 2 | ||||
| -rw-r--r-- | src/midi_sequencer.h | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/adlmidi_midiplay.cpp b/src/adlmidi_midiplay.cpp index c4cac5d..88d3c0c 100644 --- a/src/adlmidi_midiplay.cpp +++ b/src/adlmidi_midiplay.cpp @@ -994,7 +994,7 @@ void MIDIplay::realTime_deviceSwitch(size_t track, const char *data, size_t leng m_currentMidiDevice[track] = chooseDevice(indata); } -uint64_t MIDIplay::realTime_currentDevice(size_t track) +size_t MIDIplay::realTime_currentDevice(size_t track) { if(m_currentMidiDevice.empty()) return 0; @@ -1583,9 +1583,9 @@ void MIDIplay::updateVibrato(double amount) } } -uint64_t MIDIplay::chooseDevice(const std::string &name) +size_t MIDIplay::chooseDevice(const std::string &name) { - std::map<std::string, uint64_t>::iterator i = m_midiDevices.find(name); + std::map<std::string, size_t>::iterator i = m_midiDevices.find(name); if(i != m_midiDevices.end()) return i->second; diff --git a/src/adlmidi_private.hpp b/src/adlmidi_private.hpp index a7374f7..ffec1b2 100644 --- a/src/adlmidi_private.hpp +++ b/src/adlmidi_private.hpp @@ -995,9 +995,9 @@ public: private: //! Per-track MIDI devices map - std::map<std::string, uint64_t> m_midiDevices; + std::map<std::string, size_t> m_midiDevices; //! Current MIDI device per track - std::map<uint64_t /*track*/, uint64_t /*channel begin index*/> m_currentMidiDevice; + std::map<size_t /*track*/, size_t /*channel begin index*/> m_currentMidiDevice; //! Padding to fix CLanc code model's warning char _padding[7]; @@ -1223,7 +1223,7 @@ public: * @param track MIDI track index * @return Multiple 16 value */ - uint64_t realTime_currentDevice(size_t track); + size_t realTime_currentDevice(size_t track); /** * @brief Send raw OPL chip command @@ -1423,7 +1423,7 @@ public: * @param name Name of MIDI device * @return Offset of the MIDI Channels, multiple to 16 */ - uint64_t chooseDevice(const std::string &name); + size_t chooseDevice(const std::string &name); }; // I think, this is useless inside of Library diff --git a/src/adlmidi_sequencer.cpp b/src/adlmidi_sequencer.cpp index 516f80d..3c18cad 100644 --- a/src/adlmidi_sequencer.cpp +++ b/src/adlmidi_sequencer.cpp @@ -96,7 +96,7 @@ static void rtDeviceSwitch(void *userdata, size_t track, const char *data, size_ context->realTime_deviceSwitch(track, data, length); } -static uint64_t rtCurrentDevice(void *userdata, size_t track) +static size_t rtCurrentDevice(void *userdata, size_t track) { MIDIplay *context = reinterpret_cast<MIDIplay *>(userdata); return context->realTime_currentDevice(track); diff --git a/src/midi_sequencer.h b/src/midi_sequencer.h index afbffed..c6069d7 100644 --- a/src/midi_sequencer.h +++ b/src/midi_sequencer.h @@ -111,7 +111,7 @@ typedef struct RtDeviceSwitch rt_deviceSwitch; /*! Get the channels offset for current MIDI device */ - typedef uint64_t (*RtCurrentDevice)(void *userdata, size_t track); + typedef size_t (*RtCurrentDevice)(void *userdata, size_t track); /*! Get the channels offset for current MIDI device hook. Returms multiple to 16 value. */ RtCurrentDevice rt_currentDevice; |