aboutsummaryrefslogtreecommitdiff
path: root/src/adlmidi_midiplay.cpp
diff options
context:
space:
mode:
authorVitaly Novichkov <admin@wohlnet.ru>2017-12-09 23:49:02 +0300
committerVitaly Novichkov <admin@wohlnet.ru>2017-12-09 23:49:02 +0300
commit48708549ff5f8bc7388c0cb9121583932e932439 (patch)
treee323b3aa8ba7f7551e39b54cce0ea07444506125 /src/adlmidi_midiplay.cpp
parent9e2029b353bdcc9de15aca07050072ecf75f845a (diff)
downloadlibADLMIDI-48708549ff5f8bc7388c0cb9121583932e932439.tar.gz
libADLMIDI-48708549ff5f8bc7388c0cb9121583932e932439.tar.bz2
libADLMIDI-48708549ff5f8bc7388c0cb9121583932e932439.zip
Remove temporary debug prints
to merge some of changes into Master branch
Diffstat (limited to 'src/adlmidi_midiplay.cpp')
-rw-r--r--src/adlmidi_midiplay.cpp53
1 files changed, 2 insertions, 51 deletions
diff --git a/src/adlmidi_midiplay.cpp b/src/adlmidi_midiplay.cpp
index 76641a6..c88a796 100644
--- a/src/adlmidi_midiplay.cpp
+++ b/src/adlmidi_midiplay.cpp
@@ -158,40 +158,6 @@ void MIDIplay::MidiTrackRow::reset()
events.clear();
}
-void TEMP_DEBUG_printSet(std::set<size_t> &container, const char *messsage = "")
-{
- std::printf("===============%s===============\n", messsage);
- std::printf("Set Count: %u\n", container.size());
- std::fflush(stdout);
- if(container.empty())
- return;
- for(std::set<size_t>::iterator j = container.begin(); j != container.end(); j++)
- {
- size_t field = *j;
- std::printf("SET ITEM: [%d]\n", (unsigned int)(field));
- std::fflush(stdout);
- }
- std::printf("---------------%s-END-----------\n", messsage);
- std::fflush(stdout);
-}
-
-void TEMP_DEBUG_printVector(std::vector<MIDIplay::MidiEvent> &container, const char *messsage = "")
-{
- std::printf("===============%s===============\n", messsage);
- std::printf("Vector Count: %u\n", container.size());
- std::fflush(stdout);
- if(container.empty())
- return;
- for(std::vector<MIDIplay::MidiEvent>::iterator j = container.begin(); j != container.end(); j++)
- {
- MIDIplay::MidiEvent &e = *j;
- std::printf("VECTOR ITEM: Ch %d, Valid %d, Type %d\n", j->channel, (int)j->isValid, j->type);
- std::fflush(stdout);
- }
- std::printf("---------------%s-END-----------\n", messsage);
- std::fflush(stdout);
-}
-
void MIDIplay::MidiTrackRow::sortEvents(bool *noteStates)
{
typedef std::vector<MidiEvent> EvtArr;
@@ -222,15 +188,12 @@ void MIDIplay::MidiTrackRow::sortEvents(bool *noteStates)
anyOther.push_back(events[i]);
}
- TEMP_DEBUG_printVector(noteOffs, "Filled");
-
/*
* If Note-Off and it's Note-On is on the same row - move this damned note off down!
*/
if(noteStates)
{
std::set<size_t> markAsOn;
- TEMP_DEBUG_printSet(markAsOn, "Initialized");
for(size_t i = 0; i < anyOther.size(); i++)
{
const MidiEvent e = anyOther[i];
@@ -239,7 +202,7 @@ void MIDIplay::MidiTrackRow::sortEvents(bool *noteStates)
const size_t note_i = (e.channel * 255) + (e.data[0] & 0x7F);
//Check, was previously note is on or off
bool wasOn = noteStates[note_i];
- markAsOn.insert(note_i); TEMP_DEBUG_printSet(markAsOn, "Inserted");
+ markAsOn.insert(note_i);
// Detect zero-length notes are following previously pressed note
int noteOffsOnSameNote = 0;
for(EvtArr::iterator j = noteOffs.begin(); j != noteOffs.end();)
@@ -255,7 +218,7 @@ void MIDIplay::MidiTrackRow::sortEvents(bool *noteStates)
{
anyOther.push_back(*j);
j = noteOffs.erase(j);
- markAsOn.erase(note_i); TEMP_DEBUG_printSet(markAsOn, "Erased");
+ markAsOn.erase(note_i);
continue;
} else {
//When same row has many note-offs on same row
@@ -265,16 +228,9 @@ void MIDIplay::MidiTrackRow::sortEvents(bool *noteStates)
}
}
j++;
- TEMP_DEBUG_printVector(noteOffs, "Iterated");
}
- TEMP_DEBUG_printVector(noteOffs, "Quit from noteOffs loop");
- TEMP_DEBUG_printSet(markAsOn, "Quit from noteOffs loop");
}
- TEMP_DEBUG_printVector(noteOffs, "Quit from if NOTEON");
- TEMP_DEBUG_printSet(markAsOn, "Quit from if NOTEON");
}
- TEMP_DEBUG_printVector(noteOffs, "Quit from anyOther loop");
- TEMP_DEBUG_printSet(markAsOn, "Quit from anyOther loop");
//Mark other notes as released
for(EvtArr::iterator j = noteOffs.begin(); j != noteOffs.end(); j++)
@@ -282,14 +238,9 @@ void MIDIplay::MidiTrackRow::sortEvents(bool *noteStates)
size_t note_i = (j->channel * 255) + (j->data[0] & 0x7F);
noteStates[note_i] = false;
}
- TEMP_DEBUG_printVector(noteOffs, "Post-process noteOffs");
- TEMP_DEBUG_printSet(markAsOn, "Post-process noteOffs");
for(std::set<size_t>::iterator j = markAsOn.begin(); j != markAsOn.end(); j++)
noteStates[*j] = true;
-
- TEMP_DEBUG_printVector(noteOffs, "Post-process markAsOn");
- TEMP_DEBUG_printSet(markAsOn, "Post-process markAsOn");
}
/***********************************************************************************/