diff options
| author | Vitaly Novichkov <admin@wohlnet.ru> | 2018-06-25 20:37:03 +0300 |
|---|---|---|
| committer | Vitaly Novichkov <admin@wohlnet.ru> | 2018-06-25 20:37:03 +0300 |
| commit | c5509c43b4010ecc3d4f8b464996b26756b645e6 (patch) | |
| tree | f53e3f62b424b4f3052eece54d304039d8e1aada /src/adlmidi_sequencer.cpp | |
| parent | e3a353a6b84b47ad4204b110249bc74b16554985 (diff) | |
| parent | e1bb226e1b8235a2aa80141fc07a305b8a5f1818 (diff) | |
| download | libADLMIDI-c5509c43b4010ecc3d4f8b464996b26756b645e6.tar.gz libADLMIDI-c5509c43b4010ecc3d4f8b464996b26756b645e6.tar.bz2 libADLMIDI-c5509c43b4010ecc3d4f8b464996b26756b645e6.zip | |
Merge branch 'master' into stable
Diffstat (limited to 'src/adlmidi_sequencer.cpp')
| -rw-r--r-- | src/adlmidi_sequencer.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/adlmidi_sequencer.cpp b/src/adlmidi_sequencer.cpp index b8bf3dd..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); @@ -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<int64_t>(s * 1000.0)); + for(uint16_t c = 0; c < m_synth.m_numChannels; ++c) + m_chipChannels[c].addAge(static_cast<int64_t>(s * 1000.0)); - UpdateVibrato(s); - UpdateArpeggio(s); + updateVibrato(s); + updateArpeggio(s); #if !defined(ADLMIDI_AUDIO_TICK_HANDLER) - UpdateGlide(s); + updateGlide(s); #endif return ret; |