diff options
| author | David Robillard <d@drobilla.net> | 2006-08-14 08:44:14 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2006-08-14 08:44:14 +0000 |
| commit | d752986314eb37151983393c1d62efefe503e47c (patch) | |
| tree | a98e98b047fd81664e6d3148f4fff65bf86a1e20 /libs/ardour/midi_region.cc | |
| parent | 0b572cdd84151335594965a3f0ed16f1665dfa56 (diff) | |
- MIDI "recording" - rec region creation/drawing, actual MIDI region creation/view/pretty pictures/etc
- MIDI containing session saving and restoring (ie XML - Source, Region, Playlist; all but the actual .mid files)
- Numerous little fixes for audio specific stuff to accomplish the above
- Dirty hacks to accomplish the above
- Profit!!!
git-svn-id: svn://localhost/ardour2/branches/midi@821 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/midi_region.cc')
| -rw-r--r-- | libs/ardour/midi_region.cc | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/libs/ardour/midi_region.cc b/libs/ardour/midi_region.cc index 0902337030..5b8a49049e 100644 --- a/libs/ardour/midi_region.cc +++ b/libs/ardour/midi_region.cc @@ -48,7 +48,7 @@ using namespace ARDOUR; /** Basic MidiRegion constructor (one channel) */ MidiRegion::MidiRegion (MidiSource& src, jack_nframes_t start, jack_nframes_t length, bool announce) - : Region (src, start, length, PBD::basename_nosuffix(src.name()), 0, Region::Flag(Region::DefaultFlags|Region::External)) + : Region (src, start, length, PBD::basename_nosuffix(src.name()), DataType::MIDI, 0, Region::Flag(Region::DefaultFlags|Region::External)) { save_state ("initial state"); @@ -59,7 +59,7 @@ MidiRegion::MidiRegion (MidiSource& src, jack_nframes_t start, jack_nframes_t le /* Basic MidiRegion constructor (one channel) */ MidiRegion::MidiRegion (MidiSource& src, jack_nframes_t start, jack_nframes_t length, const string& name, layer_t layer, Flag flags, bool announce) - : Region (src, start, length, name, layer, flags) + : Region (src, start, length, name, DataType::MIDI, layer, flags) { save_state ("initial state"); @@ -70,7 +70,7 @@ MidiRegion::MidiRegion (MidiSource& src, jack_nframes_t start, jack_nframes_t le /* Basic MidiRegion constructor (many channels) */ MidiRegion::MidiRegion (SourceList& srcs, jack_nframes_t start, jack_nframes_t length, const string& name, layer_t layer, Flag flags, bool announce) - : Region (srcs, start, length, name, layer, flags) + : Region (srcs, start, length, name, DataType::MIDI, layer, flags) { save_state ("initial state"); @@ -108,6 +108,8 @@ MidiRegion::MidiRegion (MidiSource& src, const XMLNode& node) save_state ("initial state"); + assert(_type == DataType::MIDI); + CheckNewRegion (this); /* EMIT SIGNAL */ } @@ -120,6 +122,8 @@ MidiRegion::MidiRegion (SourceList& srcs, const XMLNode& node) save_state ("initial state"); + assert(_type == DataType::MIDI); + CheckNewRegion (this); /* EMIT SIGNAL */ } @@ -332,6 +336,8 @@ MidiRegion::separate_by_channel (Session& session, vector<MidiRegion*>& v) const v.push_back (new MidiRegion (srcs, _start, _length, new_name, _layer, _flags)); } #endif + + // Actually, I would prefer not if that's alright return -1; } |