diff options
author | David Robillard <d@drobilla.net> | 2007-10-07 07:20:09 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2007-10-07 07:20:09 +0000 |
commit | 49763a55c9bcbff2cb7844f36df777bbfadab172 (patch) | |
tree | 6751da6e2c8c24207fd197ef4fca7c5bb8f467d1 /libs/ardour/midi_diskstream.cc | |
parent | 7d2efe25ac9ab876c91684591a7bbf02337f9476 (diff) |
Fix several MIDI timestamp related problems:
Fix recording MIDI regions that start at t != 0.
Fix display of MIDI events in regions that start at t != 0.
Fix recording after relocating an already rec-armed MIDI track.
git-svn-id: svn://localhost/ardour2/trunk@2528 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/midi_diskstream.cc')
-rw-r--r-- | libs/ardour/midi_diskstream.cc | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/libs/ardour/midi_diskstream.cc b/libs/ardour/midi_diskstream.cc index 54f4c10698..2b8f70a307 100644 --- a/libs/ardour/midi_diskstream.cc +++ b/libs/ardour/midi_diskstream.cc @@ -137,6 +137,14 @@ MidiDiskstream::~MidiDiskstream () Glib::Mutex::Lock lm (state_lock); } + +void +MidiDiskstream::non_realtime_locate (nframes_t position) +{ + _write_source->set_timeline_position (position); +} + + void MidiDiskstream::non_realtime_input_change () { @@ -1195,7 +1203,7 @@ MidiDiskstream::engage_record_enable () _source_port->request_monitor_input (!(Config->get_auto_input() && rolling)); } - _write_source->mark_streaming_midi_write_started (_note_mode); + _write_source->mark_streaming_midi_write_started (_note_mode, _session.transport_frame()); RecordEnableChanged (); /* EMIT SIGNAL */ } |