diff options
| author | David Robillard <d@drobilla.net> | 2007-08-01 23:18:56 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2007-08-01 23:18:56 +0000 |
| commit | 874f3bbf8b4b8bb3e92f31c96623b1bcb4dd5c8a (patch) | |
| tree | b649f164fa22e8a05b9d70c7022e1c1e02829223 /gtk2_ardour | |
| parent | 6698f5f686bef82b0c9568558c83a3b9b3344700 (diff) | |
Fix note delete crash bug.
Fix midi recording crash bug.
git-svn-id: svn://localhost/ardour2/trunk@2216 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/midi_region_view.cc | 5 | ||||
| -rw-r--r-- | gtk2_ardour/midi_streamview.cc | 23 |
2 files changed, 22 insertions, 6 deletions
diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc index 61d3ce770d..eadbb7ce52 100644 --- a/gtk2_ardour/midi_region_view.cc +++ b/gtk2_ardour/midi_region_view.cc @@ -61,6 +61,7 @@ MidiRegionView::MidiRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView & Gdk::Color& basic_color) : RegionView (parent, tv, r, spu, basic_color) , _active_notes(0) + , _delta_command(NULL) , _command_mode(None) { } @@ -69,6 +70,7 @@ MidiRegionView::MidiRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView & Gdk::Color& basic_color, TimeAxisViewItem::Visibility visibility) : RegionView (parent, tv, r, spu, basic_color, visibility) , _active_notes(0) + , _delta_command(NULL) , _command_mode(None) { } @@ -76,6 +78,9 @@ MidiRegionView::MidiRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView & void MidiRegionView::init (Gdk::Color& basic_color, bool wfd) { + if (wfd) + midi_region()->midi_source(0)->load_model(); + _model = midi_region()->midi_source(0)->model(); _enable_display = false; diff --git a/gtk2_ardour/midi_streamview.cc b/gtk2_ardour/midi_streamview.cc index 31a36ebd39..30de0090fd 100644 --- a/gtk2_ardour/midi_streamview.cc +++ b/gtk2_ardour/midi_streamview.cc @@ -108,8 +108,10 @@ MidiStreamView::add_region_view_internal (boost::shared_ptr<Region> r, bool wfd) /* follow global waveform setting */ - if (wfd) + if (wfd) { region_view->enable_display(true); + region_view->midi_region()->midi_source(0)->load_model(); + } /* display events and find note range */ display_region(region_view); @@ -134,10 +136,12 @@ MidiStreamView::display_region(MidiRegionView* region_view) boost::shared_ptr<MidiSource> source(region_view->midi_region()->midi_source(0)); source->load_model(); - // Find our note range - for (size_t i=0; i < source->model()->n_notes(); ++i) { - const MidiModel::Note& note = source->model()->note_at(i); - update_bounds(note.note()); + if (source->model()) { + // Find our note range + for (size_t i=0; i < source->model()->n_notes(); ++i) { + const MidiModel::Note& note = source->model()->note_at(i); + update_bounds(note.note()); + } } // Display region contents @@ -151,8 +155,15 @@ MidiStreamView::redisplay_diskstream () list<RegionView *>::iterator i, tmp; for (i = region_views.begin(); i != region_views.end(); ++i) { - (*i)->enable_display(false); + (*i)->enable_display(true); // FIXME: double display (*i)->set_valid (false); + + /* FIXME: slow. MidiRegionView needs a find_note_range method + * that finds the range without wasting time drawing the events */ + + // Load model if it isn't already, to get note range + MidiRegionView* mrv = dynamic_cast<MidiRegionView*>(*i); + mrv->midi_region()->midi_source(0)->load_model(); } //_lowest_note = 60; // middle C |