From 291bd32c9d55b963ecc22354d68bc557527cfbcb Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 7 Oct 2011 21:35:33 +0000 Subject: [PATCH] Fix crash on "Consolidate Range" on MIDI tracks (#4226). git-svn-id: svn://localhost/ardour2/branches/3.0@10200 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/editor_ops.cc | 4 ++++ libs/ardour/midi_track.cc | 9 +++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index 2e3de22635..8ba2115003 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -3368,6 +3368,10 @@ Editor::bounce_range_selection (bool replace, bool enable_processing) boost::shared_ptr r = rtv->track()->bounce_range (start, start+cnt, itt, enable_processing); + if (!r) { + continue; + } + if (replace) { list ranges; ranges.push_back (AudioRange (start, start+cnt, 0)); diff --git a/libs/ardour/midi_track.cc b/libs/ardour/midi_track.cc index f42181b458..d51e5ef067 100644 --- a/libs/ardour/midi_track.cc +++ b/libs/ardour/midi_track.cc @@ -508,9 +508,7 @@ MidiTrack::export_stuff (BufferSet& /*bufs*/, framecnt_t /*nframes*/, framepos_t boost::shared_ptr MidiTrack::bounce (InterThreadInfo& /*itt*/) { - throw; - // vector srcs; - // return _session.write_one_track (*this, 0, _session.current_end_frame(), false, srcs, itt); + std::cerr << "MIDI bounce currently unsupported" << std::endl; return boost::shared_ptr (); } @@ -518,15 +516,14 @@ MidiTrack::bounce (InterThreadInfo& /*itt*/) boost::shared_ptr MidiTrack::bounce_range (framepos_t /*start*/, framepos_t /*end*/, InterThreadInfo& /*itt*/, bool /*enable_processing*/) { - throw; - //vector srcs; - //return _session.write_one_track (*this, start, end, false, srcs, itt); + std::cerr << "MIDI bounce range currently unsupported" << std::endl; return boost::shared_ptr (); } void MidiTrack::freeze_me (InterThreadInfo& /*itt*/) { + std::cerr << "MIDI freeze currently unsupported" << std::endl; } void -- 2.30.2