Menu
▾
▴
[Lmuse-cvs-traffic] muse/muse app.cpp,1.206,1.207 app.h,1.72,1.73 appearance.cpp,1.24,1.25 audio.cpp,1.106,1.107 audioprefetch.cpp,1.22,1.23 conf.cpp,1.72,1.73 midiport.cpp,1.86,1.87 midiseq.cpp,1.73,1.74 node.cpp,1.64,1.65 route.cpp,1.38,1.39 song.cpp,1.139,1.140 synth.cpp,1.79,1.80 ticksynth.cpp,1.18,1.19 wavetrack.cpp,1.25,1.26
|
From: werner s. <wsc...@us...> - 2005-12-04 17:41:20
|
Update of /cvsroot/lmuse/muse/muse In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1651/muse Modified Files: app.cpp app.h appearance.cpp audio.cpp audioprefetch.cpp conf.cpp midiport.cpp midiseq.cpp node.cpp route.cpp song.cpp synth.cpp ticksynth.cpp wavetrack.cpp Log Message: updates Index: appearance.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/appearance.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** appearance.cpp 29 Nov 2005 20:49:13 -0000 1.24 --- appearance.cpp 4 Dec 2005 17:41:11 -0000 1.25 *************** *** 323,327 **** config->fonts[0]->setBold(bold0->isChecked()); ! //TD QApplication::setFont(config->fonts[0], true); config->fonts[1]->setPointSize(fontSize1->value()); --- 323,327 ---- config->fonts[0]->setBold(bold0->isChecked()); ! QApplication::setFont(*config->fonts[0]); config->fonts[1]->setPointSize(fontSize1->value()); Index: ticksynth.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/ticksynth.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** ticksynth.cpp 5 Nov 2005 16:56:17 -0000 1.18 --- ticksynth.cpp 4 Dec 2005 17:41:11 -0000 1.19 *************** *** 85,89 **** for (; i != el->end(); ++i) { ! int frame = i->time() - frameOffset; if (frame >= endPos) break; --- 85,89 ---- for (; i != el->end(); ++i) { ! unsigned frame = i->time() - frameOffset; if (frame >= endPos) break; Index: node.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/node.cpp,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** node.cpp 18 Nov 2005 16:51:14 -0000 1.64 --- node.cpp 4 Dec 2005 17:41:11 -0000 1.65 *************** *** 748,753 **** if (jackPorts[i]) buffer[i] = audioDriver->getBuffer(jackPorts[i], n); ! else printf("PANIC: processInit: no buffer from audio driver\n"); } for (int i = 0; i < channels(); ++i) --- 748,755 ---- if (jackPorts[i]) buffer[i] = audioDriver->getBuffer(jackPorts[i], n); ! else { printf("PANIC: processInit: no buffer from audio driver\n"); + abort(); + } } for (int i = 0; i < channels(); ++i) Index: app.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/app.cpp,v retrieving revision 1.206 retrieving revision 1.207 diff -C2 -d -r1.206 -r1.207 *** app.cpp 2 Dec 2005 16:07:53 -0000 1.206 --- app.cpp 4 Dec 2005 17:41:11 -0000 1.207 *************** *** 213,217 **** { audio->msgIdle(true); ! sleep(1); song->setStop(true); song->setStopPlay(false); --- 213,217 ---- { audio->msgIdle(true); ! // sleep(1); song->setStop(true); song->setStopPlay(false); *************** *** 1777,1781 **** fprintf(stderr, " -o debug mode: trace midi Output\n"); fprintf(stderr, " -s debug mode: trace sync\n"); ! fprintf(stderr, " -P n set real time priority to n (default: %d)\n", realTimePriority); fprintf(stderr, " -p don't load LADSPA plugins\n"); --- 1777,1781 ---- fprintf(stderr, " -o debug mode: trace midi Output\n"); fprintf(stderr, " -s debug mode: trace sync\n"); ! fprintf(stderr, " -P n set real time priority to n (default: %d)\n", realTimePriority); fprintf(stderr, " -p don't load LADSPA plugins\n"); *************** *** 1855,1859 **** readConfiguration(); ! //TD QApplication::setFont(config.fonts[0], true); // SHOW MUSE SPLASH SCREEN --- 1855,1859 ---- readConfiguration(); ! QApplication::setFont(*config.fonts[0]); // SHOW MUSE SPLASH SCREEN *************** *** 2313,2320 **** //--------------------------------------------------------- ! void MusE::loadTheme(QString /*s*/) { ! //TD if (style()->name() != s) ! // QApplication::setStyle(s); } --- 2313,2320 ---- //--------------------------------------------------------- ! void MusE::loadTheme(const QString& s) { ! if (style()->objectName() != s) ! QApplication::setStyle(s); } *************** *** 2331,2335 **** writeGlobalConfiguration(); loadTheme(config.style); ! //TD setFont(config.fonts[0], true); updateConfiguration(); emit configChanged(); --- 2331,2335 ---- writeGlobalConfiguration(); loadTheme(config.style); ! QApplication::setFont(*config.fonts[0]); updateConfiguration(); emit configChanged(); Index: conf.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/conf.cpp,v retrieving revision 1.72 retrieving revision 1.73 diff -C2 -d -r1.72 -r1.73 *** conf.cpp 3 Dec 2005 18:53:43 -0000 1.72 --- conf.cpp 4 Dec 2005 17:41:11 -0000 1.73 *************** *** 419,423 **** xml.etag("mtcoffset"); ! xml.intTag("extSyncFlag", extSyncFlag); xml.intTag("genMTCSync", genMTCSync); xml.intTag("genMCSync", genMCSync); --- 419,423 ---- xml.etag("mtcoffset"); ! xml.intTag("extSync", extSyncFlag); xml.intTag("genMTCSync", genMTCSync); xml.intTag("genMCSync", genMCSync); *************** *** 484,488 **** mtcOffset.f(), mtcOffset.sf()); xml.etag("mtcoffset"); ! xml.intTag("extSyncFlag", extSyncFlag); xml.intTag("genMTCSync", genMTCSync); xml.intTag("genMCSync", genMCSync); --- 484,488 ---- mtcOffset.f(), mtcOffset.sf()); xml.etag("mtcoffset"); ! xml.intTag("extSync", extSyncFlag); xml.intTag("genMTCSync", genMTCSync); xml.intTag("genMCSync", genMCSync); Index: synth.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/synth.cpp,v retrieving revision 1.79 retrieving revision 1.80 diff -C2 -d -r1.79 -r1.80 *** synth.cpp 5 Nov 2005 16:56:17 -0000 1.79 --- synth.cpp 4 Dec 2005 17:41:11 -0000 1.80 *************** *** 335,339 **** } if (debugMsg) ! printf("%d soft synth found\n", synthis.size()); } } --- 335,339 ---- } if (debugMsg) ! printf("%ld soft synth found\n", synthis.size()); } } Index: midiport.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/midiport.cpp,v retrieving revision 1.86 retrieving revision 1.87 diff -C2 -d -r1.86 -r1.87 *** midiport.cpp 18 Nov 2005 16:51:14 -0000 1.86 --- midiport.cpp 4 Dec 2005 17:41:11 -0000 1.87 *************** *** 527,531 **** for (iRoute i = _inRoutes.begin(); i != _inRoutes.end(); ++i) { Route r = *i; ! midiDriver->disconnect(i->port, alsaPort); } } --- 527,531 ---- for (iRoute i = _inRoutes.begin(); i != _inRoutes.end(); ++i) { Route r = *i; ! midiDriver->disconnect(r.port, alsaPort); } } Index: song.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/song.cpp,v retrieving revision 1.139 retrieving revision 1.140 diff -C2 -d -r1.139 -r1.140 *** song.cpp 23 Nov 2005 13:55:32 -0000 1.139 --- song.cpp 4 Dec 2005 17:41:11 -0000 1.140 *************** *** 1117,1122 **** bounceTrack = 0; ! for (iTrack i = _tracks.begin(); i != _tracks.end(); ++i) ! (*i)->deactivate(); _selectedTrack = 0; _tracks.clear(); --- 1117,1122 ---- bounceTrack = 0; ! // for (iTrack i = _tracks.begin(); i != _tracks.end(); ++i) ! // (*i)->deactivate(); _selectedTrack = 0; _tracks.clear(); *************** *** 1767,1776 **** track->deactivate(); _tracks.erase(track); - switch(track->type()) { - case Track::AUDIO_SOFTSYNTH: - break; - default: - break; - } } --- 1767,1770 ---- *************** *** 1823,1829 **** return; } - // _tracks.erase(track); - // if (track->isMidiTrack()) - // return; // // remove routes --- 1817,1820 ---- *************** *** 1845,1850 **** const RouteList* rl = track->inRoutes(); for (ciRoute r = rl->begin(); r != rl->end(); ++r) { - printf("remove route from out <%s> %d:\n", - r->track->name().toLatin1().data(), r->track->outRoutes()->size()); r->dump(); r->track->outRoutes()->removeRoute(src); --- 1836,1839 ---- Index: app.h =================================================================== RCS file: /cvsroot/lmuse/muse/muse/app.h,v retrieving revision 1.72 retrieving revision 1.73 diff -C2 -d -r1.72 -r1.73 *** app.h 2 Dec 2005 16:07:53 -0000 1.72 --- app.h 4 Dec 2005 17:41:11 -0000 1.73 *************** *** 234,238 **** void loadProjectFile(const QString&, bool songTemplate, bool loadAll); void toplevelDeleted(void* tl); ! void loadTheme(QString); void seqStart(); void loadTemplate(); --- 234,238 ---- void loadProjectFile(const QString&, bool songTemplate, bool loadAll); void toplevelDeleted(void* tl); ! void loadTheme(const QString&); void seqStart(); void loadTemplate(); Index: route.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/route.cpp,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** route.cpp 16 Nov 2005 17:55:59 -0000 1.38 --- route.cpp 4 Dec 2005 17:41:11 -0000 1.39 *************** *** 436,441 **** } } ! printf("internal error: cannot remove Route\n "); r.dump(); for (iRoute i = begin(); i != end(); ++i) { printf(" "); --- 436,442 ---- } } ! printf("RouteList::internal error: cannot remove Route\n "); r.dump(); + printf(" found:\n"); for (iRoute i = begin(); i != end(); ++i) { printf(" "); Index: wavetrack.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/wavetrack.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** wavetrack.cpp 20 Nov 2005 14:13:41 -0000 1.25 --- wavetrack.cpp 4 Dec 2005 17:41:11 -0000 1.26 *************** *** 153,162 **** for (; i != irl->end(); ++i) ((AudioTrack*)i->track)->addData(framePos, channels, nframe, bp); ! if (recordFlag()) { ! if (audio->isRecording() && recFile()) { if (audio->freewheel()) { } else { ! fifo.put(channels, nframe, bp, audio->pos().frame()); } } --- 153,163 ---- for (; i != irl->end(); ++i) ((AudioTrack*)i->track)->addData(framePos, channels, nframe, bp); ! if (recordFlag() && audio->isRecording()) { ! if (recFile()) { if (audio->freewheel()) { } else { ! // fifo.put(channels, nframe, bp, audio->pos().frame()); ! fifo.put(channels, nframe, bp, framePos); } } *************** *** 176,180 **** if (_prefetchFifo.get(channels, nframe, outBuffers, framePos)) { // printf("WaveTrack::getData(%s) fifo underrun\n", ! // name().toLatin1().data()); return false; } --- 177,181 ---- if (_prefetchFifo.get(channels, nframe, outBuffers, framePos)) { // printf("WaveTrack::getData(%s) fifo underrun\n", ! // name().toLatin1().data()); return false; } Index: audioprefetch.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/audioprefetch.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** audioprefetch.cpp 3 Dec 2005 18:53:43 -0000 1.22 --- audioprefetch.cpp 4 Dec 2005 17:41:11 -0000 1.23 *************** *** 160,164 **** for (iWaveTrack it = tl->begin(); it != tl->end(); ++it) { WaveTrack* track = *it; ! if ((song->bounceTrack != track) && !track->noInRoute() && track->recordFlag()) continue; int ch = track->channels(); --- 160,166 ---- for (iWaveTrack it = tl->begin(); it != tl->end(); ++it) { WaveTrack* track = *it; ! if ((song->bounceTrack != track) && !track->noInRoute() ! && track->recordFlag() ! && audio->isRecording()) continue; int ch = track->channels(); Index: midiseq.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/midiseq.cpp,v retrieving revision 1.73 retrieving revision 1.74 diff -C2 -d -r1.73 -r1.74 *** midiseq.cpp 3 Dec 2005 18:53:43 -0000 1.73 --- midiseq.cpp 4 Dec 2005 17:41:11 -0000 1.74 *************** *** 309,313 **** else if (prio > prio_max) prio = prio_max; - printf("midi thread start with prio %d\n", prio); rt_param.sched_priority = prio; --- 309,312 ---- Index: audio.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/audio.cpp,v retrieving revision 1.106 retrieving revision 1.107 diff -C2 -d -r1.106 -r1.107 *** audio.cpp 3 Dec 2005 18:53:43 -0000 1.106 --- audio.cpp 4 Dec 2005 17:41:11 -0000 1.107 *************** *** 172,180 **** void Audio::stop(bool) { - TrackList* tl = song->tracks(); - for (iTrack i = tl->begin(); i != tl->end(); ++i) - (*i)->deactivate(); midiSeq->stop(true); audioDriver->stop(); _running = false; } --- 172,188 ---- void Audio::stop(bool) { midiSeq->stop(true); audioDriver->stop(); + + MidiOutPortList* opl = song->midiOutPorts(); + for (iMidiOutPort i = opl->begin(); i != opl->end(); ++i) + (*i)->deactivate(); + MidiInPortList* ipl = song->midiInPorts(); + for (iMidiInPort i = ipl->begin(); i != ipl->end(); ++i) + (*i)->deactivate(); + + // TrackList* tl = song->tracks(); + //TD for (iTrack i = tl->begin(); i != tl->end(); ++i) + // (*i)->deactivate(); _running = false; } *************** *** 653,657 **** // song->cmdAddRecordedWave(track, startRecordPos, endRecordPos); track->stopRecording(startRecordPos, endRecordPos); ! song->setRecordFlag(track, false); } } --- 661,665 ---- // song->cmdAddRecordedWave(track, startRecordPos, endRecordPos); track->stopRecording(startRecordPos, endRecordPos); ! //do not reset record flag song->setRecordFlag(track, false); } } |