diff options
| author | David Robillard <d@drobilla.net> | 2007-08-02 21:08:18 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2007-08-02 21:08:18 +0000 |
| commit | 53415b270cfde019f8e8dcdad370439dee46b590 (patch) | |
| tree | e0e5269ab5b86e802f49a2c8603a36985a111fb9 /gtk2_ardour/midi_streamview.cc | |
| parent | 89b6edb0ce6367caf8cd453abc3565853fe6da85 (diff) | |
Little MidiEvent prettification additions, ifdef'd non-realtime aspects (for future purposes).
Fix MIDI recording crash bug.
git-svn-id: svn://localhost/ardour2/trunk@2228 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/midi_streamview.cc')
| -rw-r--r-- | gtk2_ardour/midi_streamview.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/gtk2_ardour/midi_streamview.cc b/gtk2_ardour/midi_streamview.cc index 30de0090fd..a9521a2dd9 100644 --- a/gtk2_ardour/midi_streamview.cc +++ b/gtk2_ardour/midi_streamview.cc @@ -66,8 +66,7 @@ MidiStreamView::MidiStreamView (MidiTimeAxisView& tv) canvas_rect->property_fill_color_rgba() = stream_base_color; canvas_rect->property_outline_color_rgba() = RGBA_BLACK; - //use_rec_regions = tv.editor.show_waveforms_recording (); - use_rec_regions = true; + use_rec_regions = tv.editor.show_waveforms_recording (); } MidiStreamView::~MidiStreamView () @@ -94,7 +93,7 @@ MidiStreamView::add_region_view_internal (boost::shared_ptr<Region> r, bool wfd) (*i)->set_valid (true); (*i)->enable_display(wfd); - display_region(dynamic_cast<MidiRegionView*>(*i)); + display_region(dynamic_cast<MidiRegionView*>(*i), wfd); return NULL; } @@ -114,7 +113,7 @@ MidiStreamView::add_region_view_internal (boost::shared_ptr<Region> r, bool wfd) } /* display events and find note range */ - display_region(region_view); + display_region(region_view, wfd); /* always display at least 1 octave range */ _highest_note = max(_highest_note, static_cast<uint8_t>(_lowest_note + 11)); @@ -128,13 +127,15 @@ MidiStreamView::add_region_view_internal (boost::shared_ptr<Region> r, bool wfd) } void -MidiStreamView::display_region(MidiRegionView* region_view) +MidiStreamView::display_region(MidiRegionView* region_view, bool load_model) { if ( ! region_view) return; boost::shared_ptr<MidiSource> source(region_view->midi_region()->midi_source(0)); - source->load_model(); + + if (load_model) + source->load_model(); if (source->model()) { // Find our note range |