diff options
| author | David Robillard <d@drobilla.net> | 2007-06-05 16:39:23 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2007-06-05 16:39:23 +0000 |
| commit | 7852cc219cddcc86f747fed6616195f5a7642041 (patch) | |
| tree | caf501536c5947406f21607e4ad72046f7ee2032 /gtk2_ardour | |
| parent | e9de0dec8a96d42ff0fd1ba406dfaba5f76ba2a0 (diff) | |
Save MIDI files to interchange/sessionname/midifiles (instead of audiofiles).
Fix some uninitialized variables in Streamview.
Tempo-based SMF source (internally only).
Horrible crash on MIDI record finish.
git-svn-id: svn://localhost/ardour2/trunk@1955 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/midi_region_view.cc | 13 | ||||
| -rw-r--r-- | gtk2_ardour/streamview.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/time_axis_view.cc | 2 |
3 files changed, 11 insertions, 6 deletions
diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc index c3a7e1830d..2282752b6e 100644 --- a/gtk2_ardour/midi_region_view.cc +++ b/gtk2_ardour/midi_region_view.cc @@ -87,13 +87,14 @@ MidiRegionView::init (Gdk::Color& basic_color, bool wfd) set_colors (); - boost::shared_ptr<MidiRegion> mr = boost::dynamic_pointer_cast<MidiRegion> (_region); - mr->midi_source(0)->load_model(); + if (wfd) { + midi_region()->midi_source(0)->load_model(); - begin_write(); - for (size_t i=0; i < mr->midi_source(0)->model().n_events(); ++i) - add_event(mr->midi_source(0)->model().event_at(i)); - end_write(); + begin_write(); + for (size_t i=0; i < midi_region()->midi_source(0)->model().n_events(); ++i) + add_event(midi_region()->midi_source(0)->model().event_at(i)); + end_write(); + } } MidiRegionView::~MidiRegionView () diff --git a/gtk2_ardour/streamview.cc b/gtk2_ardour/streamview.cc index 2997661848..34b0238769 100644 --- a/gtk2_ardour/streamview.cc +++ b/gtk2_ardour/streamview.cc @@ -57,6 +57,8 @@ StreamView::StreamView (RouteTimeAxisView& tv) , region_color(_trackview.color()) , stream_base_color(0xFFFFFFFF) , layers(1) + , height(tv.height) + , layer_display(Overlaid) , last_rec_data_frame(0) { /* set_position() will position the group */ diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc index 1351ef9105..fdacf1178b 100644 --- a/gtk2_ardour/time_axis_view.cc +++ b/gtk2_ardour/time_axis_view.cc @@ -71,6 +71,8 @@ bool TimeAxisView::need_size_info = true; TimeAxisView::TimeAxisView (ARDOUR::Session& sess, PublicEditor& ed, TimeAxisView* rent, Canvas& canvas) : AxisView (sess), editor (ed), + y_position(0), + order(0), controls_table (2, 8) { if (need_size_info) { |