[Gtab-cvs] src/midi MidiStack.cpp,1.5,1.6
Status: Alpha
Brought to you by:
m0ta
|
From: m0ta <m0...@us...> - 2006-08-03 15:35:00
|
Update of /cvsroot/gtab/src/midi In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv14599/midi Modified Files: MidiStack.cpp Log Message: * changes to reduce warnings Index: MidiStack.cpp =================================================================== RCS file: /cvsroot/gtab/src/midi/MidiStack.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** MidiStack.cpp 28 Feb 2006 07:15:24 -0000 1.5 --- MidiStack.cpp 3 Aug 2006 15:34:56 -0000 1.6 *************** *** 23,27 **** MidiStack::MidiStack() { ! } --- 23,27 ---- MidiStack::MidiStack() { ! } *************** *** 52,66 **** for(MidiStackList::iterator iStack = stacks.begin(); iStack != stacks.end(); ++iStack) - { (*iStack)->reset(); ! } ! while( true ) ! { ! size_t minDuration = -1; MidiEvent* currentEvent = new MidiEvent; if(stacks.empty()) - { break; - } for(MidiStackList::iterator iStack = stacks.begin(); iStack != stacks.end(); ++iStack) { --- 52,62 ---- for(MidiStackList::iterator iStack = stacks.begin(); iStack != stacks.end(); ++iStack) (*iStack)->reset(); ! ! while( true ) { ! int minDuration = -1; MidiEvent* currentEvent = new MidiEvent; if(stacks.empty()) break; for(MidiStackList::iterator iStack = stacks.begin(); iStack != stacks.end(); ++iStack) { *************** *** 71,75 **** if( (*iStack)->currentTime() <= currentTime() ) { MidiEvent* event = (*iStack)->leftMost(); ! minDuration = std::min(minDuration, (size_t)event->duration()); (*iStack)->removeLeftMost(); currentEvent->combine( event ); --- 67,71 ---- if( (*iStack)->currentTime() <= currentTime() ) { MidiEvent* event = (*iStack)->leftMost(); ! minDuration = std::min(minDuration, event->duration()); (*iStack)->removeLeftMost(); currentEvent->combine( event ); *************** *** 77,81 **** } } ! if( minDuration == -1) minDuration = 0; --- 73,77 ---- } } ! if (minDuration == -1) minDuration = 0; |