summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/midi_region_view.cc4
-rw-r--r--gtk2_ardour/midi_streamview.cc4
-rw-r--r--gtk2_ardour/time_axis_view.cc1
3 files changed, 5 insertions, 4 deletions
diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc
index 2282752b6e..b4b3f18e3b 100644
--- a/gtk2_ardour/midi_region_view.cc
+++ b/gtk2_ardour/midi_region_view.cc
@@ -91,8 +91,8 @@ MidiRegionView::init (Gdk::Color& basic_color, bool wfd)
midi_region()->midi_source(0)->load_model();
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));
+ 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();
}
}
diff --git a/gtk2_ardour/midi_streamview.cc b/gtk2_ardour/midi_streamview.cc
index ee6cff28dc..6f0718bdda 100644
--- a/gtk2_ardour/midi_streamview.cc
+++ b/gtk2_ardour/midi_streamview.cc
@@ -110,8 +110,8 @@ MidiStreamView::add_region_view_internal (boost::shared_ptr<Region> r, bool wait
/* display events */
region_view->begin_write();
- for (size_t i=0; i < region->midi_source(0)->model().n_events(); ++i)
- region_view->add_event(region->midi_source(0)->model().event_at(i));
+ for (size_t i=0; i < region->midi_source(0)->model()->n_events(); ++i)
+ region_view->add_event(region->midi_source(0)->model()->event_at(i));
region_view->end_write();
/* catch regionview going away */
diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc
index fdacf1178b..63ff062268 100644
--- a/gtk2_ardour/time_axis_view.cc
+++ b/gtk2_ardour/time_axis_view.cc
@@ -71,6 +71,7 @@ bool TimeAxisView::need_size_info = true;
TimeAxisView::TimeAxisView (ARDOUR::Session& sess, PublicEditor& ed, TimeAxisView* rent, Canvas& canvas)
: AxisView (sess),
editor (ed),
+ height_style(Small),
y_position(0),
order(0),
controls_table (2, 8)