summaryrefslogtreecommitdiff
path: root/muse2/muse/part.cpp
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2012-05-28 14:15:52 +0000
committerFlorian Jung <flo@windfisch.org>2012-05-28 14:15:52 +0000
commitd2a88cfaad5ac385fc3c6212c09ad7fbc38e9454 (patch)
tree387da0b38255003e1a971629ea0de32273ac3d3c /muse2/muse/part.cpp
parent716f5a5b56a3b7ff59004ef0a1af5f98cb2a691c (diff)
merged with release_2_0
Diffstat (limited to 'muse2/muse/part.cpp')
-rw-r--r--muse2/muse/part.cpp23
1 files changed, 18 insertions, 5 deletions
diff --git a/muse2/muse/part.cpp b/muse2/muse/part.cpp
index 8363ff68..a632bc9c 100644
--- a/muse2/muse/part.cpp
+++ b/muse2/muse/part.cpp
@@ -167,6 +167,7 @@ void chainClone(Part* p)
// replaceClone
//---------------------------------------------------------
+// this replaces p1 by p2. p1 is isolated, and p2 takes its place instead.
void replaceClone(Part* p1, Part* p2)
{
chainCheckErr(p1);
@@ -181,7 +182,7 @@ void replaceClone(Part* p1, Part* p2)
if(p1->cevents() != p2->cevents())
{
bool ret = false;
- // If the part to be replaced is a single uncloned part, DELETETHIS 4 this seems outdated=wrong to me
+ // If the part to be replaced is a single uncloned part, [DELETETHIS 4 this seems outdated=wrong to me]
// and the replacement part is not, then this operation
// MUST be an undo of a de-cloning of a cloned part.
//if(p1->cevents()->refCount() <= 1 && p2->cevents()->refCount() > 1)
@@ -647,6 +648,22 @@ Part* PartList::find(int idx)
// Part
//---------------------------------------------------------
+Part::Part(const Part& p) : PosLen(p)
+{
+ _sn=p._sn;
+ _name=p._name;
+ _selected=p._selected;
+ _mute=p._mute;
+ _colorIndex=p._colorIndex;
+ _hiddenEvents=p._hiddenEvents;
+ _track=p._track;
+ _events=p._events;
+ _prevClone=p._prevClone;
+ _nextClone=p._nextClone;
+
+ _events->incRef(1);
+}
+
Part::Part(Track* t)
{
_hiddenEvents = NoEventsHidden;
@@ -662,10 +679,6 @@ Part::Part(Track* t)
_events->incARef(1);
}
-//---------------------------------------------------------
-// Part
-//---------------------------------------------------------
-
Part::Part(Track* t, EventList* ev)
{
_hiddenEvents = NoEventsHidden;