From: werner s. <wsc...@us...> - 2005-07-17 18:57:43
|
Update of /cvsroot/lmuse/muse/muse/mixer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29924/muse/mixer Modified Files: mstrip.cpp strip.cpp Log Message: more midi routing fixes Index: strip.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/mixer/strip.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** strip.cpp 21 May 2005 09:01:35 -0000 1.18 --- strip.cpp 17 Jul 2005 18:57:34 -0000 1.19 *************** *** 29,32 **** --- 29,33 ---- label->setBackgroundColor(track->ccolor()); label->setText(track->name()); + QToolTip::add(label, track->name()); } *************** *** 55,62 **** label = new QLabel(this); - setLabelText(); - label->setFont(config.fonts[1]); - label->setAlignment(AlignCenter); label->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed)); layout->addWidget(label); connect(muse, SIGNAL(configChanged()), SLOT(configChanged())); --- 56,64 ---- label = new QLabel(this); label->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed)); + label->setTextFormat(PlainText); + label->setFont(config.fonts[1]); + label->setAlignment(AlignJustify); + setLabelText(); layout->addWidget(label); connect(muse, SIGNAL(configChanged()), SLOT(configChanged())); Index: mstrip.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/mixer/mstrip.cpp,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** mstrip.cpp 17 Jul 2005 14:23:14 -0000 1.48 --- mstrip.cpp 17 Jul 2005 18:57:34 -0000 1.49 *************** *** 389,393 **** pup->setCheckable(true); MidiChannel* t = (MidiChannel*)track; ! RouteList* irl = t->inRoutes(); MidiTrackList* tl = song->midis(); --- 389,394 ---- pup->setCheckable(true); MidiChannel* t = (MidiChannel*)track; ! RouteList* irl = t->inRoutes(); ! // int channel = t->channelNo(); MidiTrackList* tl = song->midis(); *************** *** 395,399 **** for (iMidiTrack i = tl->begin();i != tl->end(); ++i, ++tn) { int id = pup->insertItem((*i)->name(), tn); - // Route dst(*i, t->channelNo()); Route dst(*i, -1, Route::TRACK); for (iRoute ir = irl->begin(); ir != irl->end(); ++ir) { --- 396,399 ---- *************** *** 408,428 **** if (n != -1) { QString s(pup->text(n)); ! Route srcRoute(t, -1, Route::TRACK); ! Route dstRoute(s, -1, Route::TRACK); ! // check if route src->dst exists: ! iRoute iorl = irl->begin(); ! for (; iorl != irl->end(); ++iorl) { ! if (*iorl == dstRoute) ! break; ! } ! if (iorl != irl->end()) { ! // disconnect if route exists audio->msgRemoveRoute(srcRoute, dstRoute); ! } ! else { ! // connect if route does not exist audio->msgAddRoute(srcRoute, dstRoute); - } song->update(SC_ROUTE); } --- 408,418 ---- if (n != -1) { QString s(pup->text(n)); ! Route dstRoute(t, -1, Route::TRACK); ! Route srcRoute(s, -1, Route::TRACK); ! if (pup->isItemChecked(n)) audio->msgRemoveRoute(srcRoute, dstRoute); ! else audio->msgAddRoute(srcRoute, dstRoute); song->update(SC_ROUTE); } *************** *** 685,707 **** Route dstRoute(mc, -1, Route::TRACK); ! // remove old route ! // note: audio->msgRemoveRoute() changes orl list ! // ! bool removed; ! do { ! removed = false; ! for (iRoute ir = orl->begin(); ir != orl->end(); ++ir) { ! Route s(track, ir->channel, Route::TRACK); ! s.dump(); ! ir->dump(); ! audio->msgRemoveRoute(s, *ir); ! removed = true; ! break; ! } ! } while (removed); ! audio->msgAddRoute(srcRoute, dstRoute); song->update(SC_ROUTE); - if (mixer) - mixer->setUpdateMixer(); } delete pup; --- 675,684 ---- Route dstRoute(mc, -1, Route::TRACK); ! if (pup->isItemChecked(n)) ! audio->msgRemoveRoute(srcRoute, dstRoute); ! else ! audio->msgAddRoute(srcRoute, dstRoute); ! song->update(SC_ROUTE); } delete pup; *************** *** 1271,1280 **** int channel = n & 0xf; MidiTrack* mt = tl->index(trackno); ! Route srcRoute(track, channel, Route::MIDIPORT); Route dstRoute(mt, channel, Route::TRACK); // remove old routes ! for (iRoute ir = orl->begin(); ir != orl->end(); ++ir) ! audio->msgRemoveRoute(srcRoute, *ir); // add new route audio->msgAddRoute(srcRoute, dstRoute); --- 1248,1257 ---- int channel = n & 0xf; MidiTrack* mt = tl->index(trackno); ! Route srcRoute(track, channel, Route::TRACK); Route dstRoute(mt, channel, Route::TRACK); // remove old routes ! // for (iRoute ir = orl->begin(); ir != orl->end(); ++ir) ! // audio->msgRemoveRoute(srcRoute, *ir); // add new route audio->msgAddRoute(srcRoute, dstRoute); |