diff options
| author | David Robillard <d@drobilla.net> | 2006-08-29 21:21:48 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2006-08-29 21:21:48 +0000 |
| commit | 82232f06ba3eea4a2b4342ad91fab552f4044402 (patch) | |
| tree | d517cb47c017f51e2ecd9450624b86eb70d9f97b /libs/ardour/ardour/midi_region.h | |
| parent | 25d1670a61d19e795227b939a98be9cf5a050c67 (diff) | |
Merged with trunk R861
Possible new bugs - not very thoroughly tested, but at least functional at first glance
git-svn-id: svn://localhost/ardour2/branches/midi@870 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/midi_region.h')
| -rw-r--r-- | libs/ardour/ardour/midi_region.h | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/libs/ardour/ardour/midi_region.h b/libs/ardour/ardour/midi_region.h index 745d3fa4a8..a5c578b7cd 100644 --- a/libs/ardour/ardour/midi_region.h +++ b/libs/ardour/ardour/midi_region.h @@ -46,16 +46,9 @@ class MidiRingBuffer; class MidiRegion : public Region { public: - MidiRegion (MidiSource&, jack_nframes_t start, jack_nframes_t length, bool announce = true); - MidiRegion (MidiSource&, jack_nframes_t start, jack_nframes_t length, const string& name, layer_t = 0, Region::Flag flags = Region::DefaultFlags, bool announce = true); - MidiRegion (SourceList &, jack_nframes_t start, jack_nframes_t length, const string& name, layer_t = 0, Region::Flag flags = Region::DefaultFlags, bool announce = true); - MidiRegion (const MidiRegion&, jack_nframes_t start, jack_nframes_t length, const string& name, layer_t = 0, Region::Flag flags = Region::DefaultFlags, bool announce = true); - MidiRegion (const MidiRegion&); - MidiRegion (MidiSource&, const XMLNode&); - MidiRegion (SourceList &, const XMLNode&); ~MidiRegion(); - MidiSource& midi_source (uint32_t n=0) const; + boost::shared_ptr<MidiSource> midi_source (uint32_t n=0) const; jack_nframes_t read_at (MidiRingBuffer& dst, jack_nframes_t position, @@ -77,6 +70,17 @@ class MidiRegion : public Region UndoAction get_memento() const; private: + friend class RegionFactory; + + MidiRegion (boost::shared_ptr<MidiSource>, jack_nframes_t start, jack_nframes_t length); + MidiRegion (boost::shared_ptr<MidiSource>, jack_nframes_t start, jack_nframes_t length, const string& name, layer_t = 0, Region::Flag flags = Region::DefaultFlags); + MidiRegion (SourceList &, jack_nframes_t start, jack_nframes_t length, const string& name, layer_t = 0, Region::Flag flags = Region::DefaultFlags); + MidiRegion (boost::shared_ptr<const MidiRegion>, jack_nframes_t start, jack_nframes_t length, const string& name, layer_t = 0, Region::Flag flags = Region::DefaultFlags); + MidiRegion (boost::shared_ptr<const MidiRegion>); + MidiRegion (boost::shared_ptr<MidiSource>, const XMLNode&); + MidiRegion (SourceList &, const XMLNode&); + + private: friend class Playlist; private: |