[Gtab-cvs] src playbackthrd.cpp,1.14,1.15
Status: Alpha
Brought to you by:
m0ta
|
From: m0ta <m0...@us...> - 2006-04-10 17:01:35
|
Update of /cvsroot/gtab/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16559 Modified Files: playbackthrd.cpp Log Message: * preparations for tempo sign Index: playbackthrd.cpp =================================================================== RCS file: /cvsroot/gtab/src/playbackthrd.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** playbackthrd.cpp 28 Feb 2006 07:15:24 -0000 1.14 --- playbackthrd.cpp 10 Apr 2006 17:01:24 -0000 1.15 *************** *** 67,76 **** MidiEvent* event; ! int tempo = 200; float timeMod = 60000.0F / tempo / QUARTER; while (ms->current() && frame_->isPlaying()) { - if (!frame_->isPaused()) { event = ms->current(); const MidiMessageList& list = event->packMessage(); for (MidiMessageList::const_iterator i = list.begin(); i != list.end(); ++i) --- 67,78 ---- MidiEvent* event; ! int tempo = 120; float timeMod = 60000.0F / tempo / QUARTER; while (ms->current() && frame_->isPlaying()) { if (!frame_->isPaused()) { event = ms->current(); + if (event->changeTempo()) + timeMod = 60000.0F / event->getTempo() / QUARTER; + const MidiMessageList& list = event->packMessage(); for (MidiMessageList::const_iterator i = list.begin(); i != list.end(); ++i) |