From: terminator356 <ter...@us...> - 2009-04-06 01:24:58
|
Update of /cvsroot/lmuse/muse/muse In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv16821/muse Modified Files: Tag: REL07 part.cpp song.cpp transport.cpp Log Message: See ChangeLog Index: part.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/part.cpp,v retrieving revision 1.12.2.11 retrieving revision 1.12.2.12 diff -C2 -d -r1.12.2.11 -r1.12.2.12 *** part.cpp 9 Mar 2009 02:05:17 -0000 1.12.2.11 --- part.cpp 6 Apr 2009 01:24:54 -0000 1.12.2.12 *************** *** 512,522 **** --- 512,534 ---- Track* nTrack = nPart->track(); + // Added by Tim. p3.3.6 + //printf("Song::changePart before oPart->removePortCtrlEvents oldPart refs:%d Arefs:%d newPart refs:%d Arefs:%d\n", oPart->events()->refCount(), oPart->events()->arefCount(), nPart->events()->refCount(), nPart->events()->arefCount()); + oPart->removePortCtrlEvents(); + // Added by Tim. p3.3.6 + //printf("Song::changePart after oPart->removePortCtrlEvents oldPart refs:%d Arefs:%d newPart refs:%d Arefs:%d\n", oPart->events()->refCount(), oPart->events()->arefCount(), nPart->events()->refCount(), nPart->events()->arefCount()); + oTrack->parts()->remove(oPart); nTrack->parts()->add(nPart); + // Added by Tim. p3.3.6 + //printf("Song::changePart after add(nPart) oldPart refs:%d Arefs:%d newPart refs:%d Arefs:%d\n", oPart->events()->refCount(), oPart->events()->arefCount(), nPart->events()->refCount(), nPart->events()->arefCount()); + nPart->addPortCtrlEvents(); + // Added by Tim. p3.3.6 + //printf("Song::changePart after nPart->addPortCtrlEvents() oldPart refs:%d Arefs:%d newPart refs:%d Arefs:%d\n", oPart->events()->refCount(), oPart->events()->arefCount(), nPart->events()->refCount(), nPart->events()->arefCount()); + // Added by T356. // adjust song len: *************** *** 525,528 **** --- 537,543 ---- _len = epos; + // Added by Tim. p3.3.6 + //printf("Song::changePart after len adjust oldPart refs:%d Arefs:%d newPart refs:%d Arefs:%d\n", oPart->events()->refCount(), oPart->events()->arefCount(), nPart->events()->refCount(), nPart->events()->arefCount()); + } Index: song.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/song.cpp,v retrieving revision 1.59.2.29 retrieving revision 1.59.2.30 diff -C2 -d -r1.59.2.29 -r1.59.2.30 *** song.cpp 28 Mar 2009 01:46:09 -0000 1.59.2.29 --- song.cpp 6 Apr 2009 01:24:54 -0000 1.59.2.30 *************** *** 1142,1147 **** // editieren, die restlichen sind 'ghostparts' // ! ! // collect marked parts for (ciMidiTrack t = _midis.begin(); t != _midis.end(); ++t) { MidiTrack* track = *t; --- 1142,1157 ---- // editieren, die restlichen sind 'ghostparts' // ! // Rough translation: ! /* ! If a part is selected, edit that. ! If a track is selected, edit the first ! part of the track, the rest are ! 'ghost parts' ! When multiple parts are selected, then edit the first, ! the rest are 'ghost parts' ! */ ! ! ! // collect marked parts for (ciMidiTrack t = _midis.begin(); t != _midis.end(); ++t) { MidiTrack* track = *t; *************** *** 1545,1551 **** void Song::cmdChangePart(Part* oldPart, Part* newPart) { changePart(oldPart, newPart); undoOp(UndoOp::ModifyPart, oldPart, newPart); ! oldPart->events()->incARef(-1); updateFlags = SC_PART_MODIFIED; } --- 1555,1576 ---- void Song::cmdChangePart(Part* oldPart, Part* newPart) { + // Added by Tim. p3.3.6 + //printf("Song::cmdChangePart before changePart oldPart:%x events:%x refs:%d Arefs:%d newPart:%x events:%x refs:%d Arefs:%d\n", oldPart, oldPart->events(), oldPart->events()->refCount(), oldPart->events()->arefCount(), newPart, newPart->events(), newPart->events()->refCount(), newPart->events()->arefCount()); + changePart(oldPart, newPart); + // Added by Tim. p3.3.6 + //printf("Song::cmdChangePart after changePart oldPart:%x events:%x refs:%d Arefs:%d newPart:%x events:%x refs:%d Arefs:%d\n", oldPart, oldPart->events(), oldPart->events()->refCount(), oldPart->events()->arefCount(), newPart, newPart->events(), newPart->events()->refCount(), newPart->events()->arefCount()); + undoOp(UndoOp::ModifyPart, oldPart, newPart); ! // Added by Tim. p3.3.6 ! //printf("Song::cmdChangePart after undoOp oldPart:%x events:%x refs:%d Arefs:%d newPart:%x events:%x refs:%d Arefs:%d\n", oldPart, oldPart->events(), oldPart->events()->refCount(), oldPart->events()->arefCount(), newPart, newPart->events(), newPart->events()->refCount(), newPart->events()->arefCount()); ! ! // Changed by T356. Do not decrement ref count if the new part is a clone of the old part, since the event list ! // will still be active. ! if(oldPart->events() != newPart->events()) ! oldPart->events()->incARef(-1); ! // Added by Tim. p3.3.6 ! //printf("Song::cmdChangePart after oldPart->events()->incARef(-1) oldPart:%x events:%x refs:%d Arefs:%d newPart:%x events:%x refs:%d Arefs:%d\n", oldPart, oldPart->events(), oldPart->events()->refCount(), oldPart->events()->arefCount(), newPart, newPart->events(), newPart->events()->refCount(), newPart->events()->arefCount()); ! updateFlags = SC_PART_MODIFIED; } Index: transport.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/transport.cpp,v retrieving revision 1.8.2.1 retrieving revision 1.8.2.2 diff -C2 -d -r1.8.2.1 -r1.8.2.2 *** transport.cpp 18 Aug 2008 00:15:23 -0000 1.8.2.1 --- transport.cpp 6 Apr 2009 01:24:54 -0000 1.8.2.2 *************** *** 199,205 **** Transport::Transport(QWidget*, const char* name) ! : QWidget(0, name, WStyle_Customize | WType_TopLevel | WStyle_Tool ! | WStyle_NoBorder | WStyle_StaysOnTop) { setSizePolicy(QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum)); --- 199,207 ---- Transport::Transport(QWidget*, const char* name) ! // : QWidget(0, name, WStyle_Customize | WType_TopLevel | WStyle_Tool ! //| WStyle_NoBorder | WStyle_StaysOnTop) ! : QWidget(0, name, WStyle_Customize | WType_TopLevel | WStyle_NoBorder | WStyle_StaysOnTop) { + setCaption(QString("Muse: Transport")); setSizePolicy(QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum)); |