Parts have their own, non-shared EventList (still WIP!)

removed refcounting in Eventlist
Part::events() is now a const EventList&
chaining parts now a Part:: member function
made Track::events, ::mpevents public instead of using an insane reference-accessor
TODO: need a grouping indicator of clones (like the eventlist pointer was used for)

3 files changed, 21 insertions, 24 deletions

diff --git a/muse2/muse/waveedit/wavecanvas.cpp b/muse2/muse/waveedit/wavecanvas.cpp
index 95ecd250..5bbe2f1f 100644
--- a/muse2/muse/waveedit/wavecanvas.cpp
+++ b/muse2/muse/waveedit/wavecanvas.cpp
@@ -79,7 +79,7 @@ namespace MusEGui {
 //   WEvent
 //---------------------------------------------------------
 
-WEvent::WEvent(MusECore::Event& e, MusECore::Part* p, int height) : MusEGui::CItem(e, p)
+WEvent::WEvent(const MusECore::Event& e, MusECore::Part* p, int height) : MusEGui::CItem(e, p)
       {
       unsigned frame = e.frame() + p->frame();
       setPos(QPoint(frame, 0));
@@ -93,7 +93,7 @@ WEvent::WEvent(MusECore::Event& e, MusECore::Part* p, int height) : MusEGui::CIt
 //   addItem
 //---------------------------------------------------------
 
-CItem* WaveCanvas::addItem(MusECore::Part* part, MusECore::Event& event)
+CItem* WaveCanvas::addItem(MusECore::Part* part, const MusECore::Event& event)
       {
       if (signed(event.frame())<0) {
             printf("ERROR: trying to add event before current part!\n");
@@ -183,9 +183,8 @@ void WaveCanvas::songChanged(MusECore::SongChangedFlags_t flags)
                   if (esample > endSample)
                         endSample = esample;
 
-                  MusECore::EventList* el = part->events();
-                  for (MusECore::iEvent i = el->begin(); i != el->end(); ++i) {
-                        MusECore::Event e = i->second;
+                  for (MusECore::ciEvent i = part->events().begin(); i != part->events().end(); ++i) {
+                        const MusECore::Event& e = i->second;
                         // Do not add events which are past the end of the part.
                         if(e.frame() > len)      
                           break;
@@ -578,9 +577,9 @@ void WaveCanvas::draw(QPainter& p, const QRect& r)
           if(ci->isSelected()) 
             list4.push_back(ci);
           // Draw clone parts, and parts with hidden events, in front of others all except selected.
-          //else if(ci->event().empty() && (ci->part()->events()->arefCount() > 1 || ci->part()->cachedHasHiddenEvents()))
+          //else if(ci->event().empty() && (ci->part()->hasClones() || ci->part()->cachedHasHiddenEvents()))
           // Draw clone parts in front of others all except selected.
-          //else if(ci->event().empty() && (ci->part()->events()->arefCount() > 1))
+          //else if(ci->event().empty() && ci->part()->hasClones())
           //  list3.push_back(ci);
           else  
             // Draw unselected parts.
@@ -1327,9 +1326,9 @@ MusECore::Undo WaveCanvas::moveCanvasItems(MusEGui::CItemList& items, int /*dp*/
     MusECore::Part* opart = ip2c->first;
     if (opart->hasHiddenEvents())
     {
-                        forbidden=true;
-                        break;
-                }
+        forbidden=true;
+        break;
+    }
   }    
 
         
@@ -1686,11 +1685,11 @@ void WaveCanvas::waveCmd(int cmd)
                   if (part == 0)
                         break;
 
-                  MusECore::EventList* el = part->events();
+                  const MusECore::EventList& el = part->events();
                   MusECore::Undo operations;
 
                   std::list <MusECore::Event> elist;
-                  for (MusECore::iEvent e = el->lower_bound(pos[0] - part->tick()); e != el->end(); ++e)
+                  for (MusECore::ciEvent e = el.lower_bound(pos[0] - part->tick()); e != el.end(); ++e)
                         elist.push_back((MusECore::Event)e->second);
                   for (std::list<MusECore::Event>::iterator i = elist.begin(); i != elist.end(); ++i) {
                         MusECore::Event event = *i;
@@ -1714,10 +1713,10 @@ void WaveCanvas::waveCmd(int cmd)
                         break;
                   
                   MusECore::Undo operations;
-                  MusECore::EventList* el = part->events();
+                  const MusECore::EventList& el = part->events();
 
                   std::list<MusECore::Event> elist;
-                  for (MusECore::iEvent e = el->lower_bound(pos[0]); e != el->end(); ++e)
+                  for (MusECore::ciEvent e = el.lower_bound(pos[0]); e != el.end(); ++e)
                         elist.push_back((MusECore::Event)e->second);
                   for (std::list<MusECore::Event>::iterator i = elist.begin(); i != elist.end(); ++i) {
                         MusECore::Event event = *i;
@@ -1927,11 +1926,11 @@ void WaveCanvas::cmd(int cmd)
                       tempPart->setPos(MusEGlobal::song->lpos());
                       tempPart->setLenTick(MusEGlobal::song->rpos() - MusEGlobal::song->lpos());
                       // loop through the events and set them accordingly
-                      for (MusECore::iEvent iWaveEvent = origPart->events()->begin(); iWaveEvent != origPart->events()->end(); iWaveEvent++)
+                      for (MusECore::ciEvent iWaveEvent = origPart->events().begin(); iWaveEvent != origPart->events().end(); iWaveEvent++)
                       {
                           // TODO: handle multiple events correctly,
                           // the math for subsequent events isn't correct
-                          MusECore::Event &ev = iWaveEvent->second;
+                          const MusECore::Event& ev = iWaveEvent->second;
                           MusECore::Event *newEvent = new MusECore::Event(ev.clone());
                           newEvent->setSpos(ev.spos() + frameDistance);
                           newEvent->setLenTick(MusEGlobal::song->rpos() - MusEGlobal::song->lpos());
@@ -1993,10 +1992,9 @@ MusECore::WaveSelectionList WaveCanvas::getSelection(unsigned startpos, unsigned
             MusECore::WavePart* wp = (MusECore::WavePart*)(ip->second);
             unsigned part_offset = wp->frame();
             
-            MusECore::EventList* el = wp->events();
-            //printf("eventlist length=%d\n",el->size());
+            const MusECore::EventList& el = wp->events();
 
-            for (MusECore::iEvent e = el->begin(); e != el->end(); ++e) {
+            for (MusECore::ciEvent e = el.begin(); e != el.end(); ++e) {
                   MusECore::Event event  = e->second;
                   if (event.empty())
                         continue;
diff --git a/muse2/muse/waveedit/wavecanvas.h b/muse2/muse/waveedit/wavecanvas.h
index 10f75291..63979915 100644
--- a/muse2/muse/waveedit/wavecanvas.h
+++ b/muse2/muse/waveedit/wavecanvas.h
@@ -64,7 +64,7 @@ namespace MusEGui {
 
 class WEvent : public CItem {
    public:
-      WEvent(MusECore::Event& e, MusECore::Part* p, int height);
+      WEvent(const MusECore::Event& e, MusECore::Part* p, int height);
       };
 
 //---------------------------------------------------------
@@ -124,7 +124,7 @@ class WaveCanvas : public EventCanvas {
       virtual void dragEnterEvent(QDragEnterEvent* event);
       virtual void dragMoveEvent(QDragMoveEvent*);
       virtual void dragLeaveEvent(QDragLeaveEvent*);
-      virtual CItem* addItem(MusECore::Part*, MusECore::Event&);
+      virtual CItem* addItem(MusECore::Part*, const MusECore::Event&);
 
       int y2pitch(int) const;
       int pitch2y(int) const;
diff --git a/muse2/muse/waveedit/waveview.cpp b/muse2/muse/waveedit/waveview.cpp
index 3e3ea057..2cb63dc5 100644
--- a/muse2/muse/waveedit/waveview.cpp
+++ b/muse2/muse/waveedit/waveview.cpp
@@ -119,9 +119,8 @@ void WaveView::pdraw(QPainter& p, const QRect& rr)
             int channels = wp->track()->channels();
             int px = wp->frame();
 
-            MusECore::EventList* el = wp->events();
-            for (MusECore::iEvent e = el->begin(); e != el->end(); ++e) {
-                  MusECore::Event event  = e->second;
+            for (MusECore::ciEvent e = wp->events().begin(); e != wp->events().end(); ++e) {
+                  const MusECore::Event event&  = e->second;
                   if (event.empty())
                         continue;
                   MusECore::SndFileR f = event.sndFile();