From 60f7ea56a4ccc88a8e747b87ba9fb39f1d8330b5 Mon Sep 17 00:00:00 2001 From: Vitaly Novichkov Date: Sun, 24 Jun 2018 21:46:38 +0300 Subject: [Experimental] Big re-factoring of internals and clean-up - Renamed functions - Renamed variables - Documenting of most library internal stuff - Disabling of embedded banks no more conflicts with accidental linking of adldata.cpp --- src/adlmidi_sequencer.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/adlmidi_sequencer.cpp') diff --git a/src/adlmidi_sequencer.cpp b/src/adlmidi_sequencer.cpp index b8bf3dd..516f80d 100644 --- a/src/adlmidi_sequencer.cpp +++ b/src/adlmidi_sequencer.cpp @@ -136,13 +136,13 @@ double MIDIplay::Tick(double s, double granularity) double ret = m_sequencer.Tick(s, granularity); s *= m_sequencer.getTempoMultiplier(); - for(uint16_t c = 0; c < opl.NumChannels; ++c) - ch[c].AddAge(static_cast(s * 1000.0)); + for(uint16_t c = 0; c < m_synth.m_numChannels; ++c) + m_chipChannels[c].addAge(static_cast(s * 1000.0)); - UpdateVibrato(s); - UpdateArpeggio(s); + updateVibrato(s); + updateArpeggio(s); #if !defined(ADLMIDI_AUDIO_TICK_HANDLER) - UpdateGlide(s); + updateGlide(s); #endif return ret; -- cgit v1.2.3 From 4155b4a044ced3a884369d0c5a10025b3a6bd71d Mon Sep 17 00:00:00 2001 From: Vitaly Novichkov Date: Mon, 25 Jun 2018 03:21:27 +0300 Subject: Use size_t instead of uint64_t on devices cache --- src/adlmidi_sequencer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/adlmidi_sequencer.cpp') 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(userdata); return context->realTime_currentDevice(track); -- cgit v1.2.3