summaryrefslogtreecommitdiff
path: root/muse2/muse/track.h
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2013-08-16 23:04:08 +0200
committerFlorian Jung <flo@windfisch.org>2013-08-16 23:04:08 +0200
commit4933ccfe7552dc5dbb2921f6583bbeb92dd144b4 (patch)
treeaca8f234f17bbe94fc78c4d1cedd8e8649d2dd1f /muse2/muse/track.h
parentbe3b3fef8d787f167b57ebfd700717a02c38570d (diff)
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)
Diffstat (limited to 'muse2/muse/track.h')
-rw-r--r--muse2/muse/track.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/muse2/muse/track.h b/muse2/muse/track.h
index 664364ba..2e8f3af5 100644
--- a/muse2/muse/track.h
+++ b/muse2/muse/track.h
@@ -32,6 +32,7 @@
#include "wave.h" // for SndFileR
#include "part.h"
+#include "mpevent.h"
#include "key.h"
#include "node.h"
#include "route.h"
@@ -41,7 +42,6 @@
#include "controlfifo.h"
namespace MusECore {
-class MPEventList;
class Pipeline;
class PluginI;
class SynthI;
@@ -212,8 +212,11 @@ class MidiTrack : public Track {
int _outChannel;
bool _recEcho; // For midi (and audio). Whether to echo incoming record events to output device.
- EventList* _events; // tmp Events during midi import
- MPEventList* _mpevents; // tmp Events druring recording
+ public:
+ EventList events; // tmp Events during midi import
+ MPEventList mpevents; // tmp Events druring recording
+
+ private:
static bool _isVisible;
clefTypes clefType;
@@ -255,9 +258,6 @@ class MidiTrack : public Track {
virtual bool setRecordFlag1(bool f) { _recordFlag = f; return true;}
virtual void setRecordFlag2(bool) {}
- EventList* events() const { return _events; }
- MPEventList* mpevents() const { return _mpevents; }
-
virtual void read(Xml&);
virtual void write(int, Xml&) const;