diff options
| author | David Robillard <d@drobilla.net> | 2008-01-10 21:20:59 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2008-01-10 21:20:59 +0000 |
| commit | bb457bb960c5bd7ed538f9d31477293415739f68 (patch) | |
| tree | 84324a63b87c03589cd165b9e474296eaebb4772 /gtk2_ardour/region_view.cc | |
| parent | 73dd9d37e7d715e0d78c0e51569968f9494dac7f (diff) | |
Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837.
git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/region_view.cc')
| -rw-r--r-- | gtk2_ardour/region_view.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc index fb715559a1..fa9ec5969b 100644 --- a/gtk2_ardour/region_view.cc +++ b/gtk2_ardour/region_view.cc @@ -123,6 +123,8 @@ RegionView::init (Gdk::Color& basic_color, bool wfd) wait_for_data = wfd; sync_mark = 0; sync_line = 0; + sync_mark = 0; + sync_line = 0; compute_colors (basic_color); @@ -132,8 +134,6 @@ RegionView::init (Gdk::Color& basic_color, bool wfd) name_text->set_data ("regionview", this); } - //reset_width_dependent_items ((double) _region->length() / samples_per_unit); - if (wfd) _enable_display = true; @@ -385,8 +385,8 @@ RegionView::fake_set_opaque (bool yn) } else { fill_opacity = 60; } - - TimeAxisViewItem::set_frame_color (); + + set_frame_color (); } void @@ -500,7 +500,7 @@ RegionView::region_sync_changed () points.clear (); points.push_back (Gnome::Art::Point (offset, 0)); - points.push_back (Gnome::Art::Point (offset, _height - NAME_HIGHLIGHT_SIZE)); + points.push_back (Gnome::Art::Point (offset, trackview.height - NAME_HIGHLIGHT_SIZE)); sync_line->property_points().set_value (points); sync_line->show (); |