From: Mathias L. <lun...@us...> - 2005-06-18 17:48:49
|
Update of /cvsroot/lmuse/muse/muse/arranger In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20545/muse/arranger Modified Files: Tag: REL07 pcanvas.cpp Log Message: Added export options of parts + import part when using drumeditor as well Index: pcanvas.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/arranger/Attic/pcanvas.cpp,v retrieving revision 1.48.2.2 retrieving revision 1.48.2.3 diff -C2 -d -r1.48.2.2 -r1.48.2.3 *** pcanvas.cpp 13 Jun 2005 18:31:26 -0000 1.48.2.2 --- pcanvas.cpp 18 Jun 2005 17:48:38 -0000 1.48.2.3 *************** *** 474,478 **** { Part* p = ((NPart*)(i))->part(); ! audio->msgRemovePart(p); return true; } --- 474,478 ---- { Part* p = ((NPart*)(i))->part(); ! audio->msgRemovePart(p); //Invokes songChanged which calls partsChanged which makes it difficult to delete them there return true; } *************** *** 551,554 **** --- 551,555 ---- partPopup->insertItem(*edit_listIcon, tr("list"), 12); partPopup->insertItem(*edit_drummsIcon, tr("drums"), 13); + partPopup->insertItem(tr("export"), 16); break; case Track::WAVE: *************** *** 649,653 **** FILE* fp = fileOpen(this, fn, ".mpt", "w", popenFlag, false, false); if (fp) { - printf("File was opened!\n"); Xml tmpXml = Xml(fp); part->write(0, tmpXml); --- 650,653 ---- *************** *** 1636,1640 **** muse->importWaveToTrack(newPath, track); } ! else if (track->type() == Track::MIDI && text.endsWith(".mpt", false)) { unsigned tick = x; --- 1636,1640 ---- muse->importWaveToTrack(newPath, track); } ! else if ((track->type() == Track::MIDI || track->type() == Track::DRUM) && text.endsWith(".mpt", false)) { unsigned tick = x; |