diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2008-09-10 15:03:30 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-09-10 15:03:30 +0000 |
commit | 68e943265edf04e63a8e8b8f62bab20f99d9c637 (patch) | |
tree | ff8941a59662fc0c4622944b65f7b2d5e3bdd0c3 /libs/ardour/midi_track.cc | |
parent | e4372df05b7d74a6b80dbbf4b6c00cc2b31c4723 (diff) |
merge from 2.0-ongoing @ 3581
git-svn-id: svn://localhost/ardour2/branches/3.0@3711 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/midi_track.cc')
-rw-r--r-- | libs/ardour/midi_track.cc | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/libs/ardour/midi_track.cc b/libs/ardour/midi_track.cc index 1000e68ba6..efb6e5b8d9 100644 --- a/libs/ardour/midi_track.cc +++ b/libs/ardour/midi_track.cc @@ -661,21 +661,23 @@ MidiTrack::set_latency_delay (nframes_t longest_session_latency) _diskstream->set_roll_delay (_roll_delay); } -void +boost::shared_ptr<Region> MidiTrack::bounce (InterThreadInfo& itt) { throw; - //vector<MidiSource*> srcs; - //_session.write_one_midi_track (*this, 0, _session.current_end_frame(), false, srcs, itt); + // vector<MidiSource*> srcs; + // return _session.write_one_track (*this, 0, _session.current_end_frame(), false, srcs, itt); + return boost::shared_ptr<Region> (); } -void +boost::shared_ptr<Region> MidiTrack::bounce_range (nframes_t start, nframes_t end, InterThreadInfo& itt) { throw; //vector<MidiSource*> srcs; - //_session.write_one_midi_track (*this, start, end, false, srcs, itt); + //return _session.write_one_track (*this, start, end, false, srcs, itt); + return boost::shared_ptr<Region> (); } void @@ -732,7 +734,7 @@ MidiTrack::MidiControl::set_value(float val) size_t size = 3; if ( ! _list->automation_playback()) { - uint8_t ev[3] = { _list->parameter().channel(), int(val), 0.0 }; + uint8_t ev[3] = { _list->parameter().channel(), int(val), 0 }; switch(_list->parameter().type()) { case MidiCCAutomation: ev[0] += MIDI_CMD_CONTROL; |