diff options
| author | Nick Mainsbridge <beatroute@iprimus.com.au> | 2009-05-22 11:58:10 +0000 |
|---|---|---|
| committer | Nick Mainsbridge <beatroute@iprimus.com.au> | 2009-05-22 11:58:10 +0000 |
| commit | 28f46b7f2cba64c3d5e34f39d7be45600dde3a58 (patch) | |
| tree | dc523a5bacab080291e39499f3fa77025583446b | |
| parent | e8730462c258eb0545244a67e99228cd3fe79207 (diff) | |
Fix tape region view crash, remove unneeded include.
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@5109 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | gtk2_ardour/region_view.h | 1 | ||||
| -rw-r--r-- | gtk2_ardour/tape_region_view.cc | 1 | ||||
| -rw-r--r-- | gtk2_ardour/time_axis_view_item.cc | 4 |
3 files changed, 4 insertions, 2 deletions
diff --git a/gtk2_ardour/region_view.h b/gtk2_ardour/region_view.h index c3e779015f..6562e8c3f0 100644 --- a/gtk2_ardour/region_view.h +++ b/gtk2_ardour/region_view.h @@ -29,7 +29,6 @@ #include "time_axis_view_item.h" #include "automation_line.h" #include "enums.h" -#include "waveview.h" #include "canvas.h" class TimeAxisView; diff --git a/gtk2_ardour/tape_region_view.cc b/gtk2_ardour/tape_region_view.cc index 97fac713c1..146f29e4f7 100644 --- a/gtk2_ardour/tape_region_view.cc +++ b/gtk2_ardour/tape_region_view.cc @@ -44,6 +44,7 @@ using namespace ArdourCanvas; const TimeAxisViewItem::Visibility TapeAudioRegionView::default_tape_visibility = TimeAxisViewItem::Visibility ( TimeAxisViewItem::ShowNameHighlight | + TimeAxisViewItem::ShowNameText | TimeAxisViewItem::ShowFrame | TimeAxisViewItem::HideFrameRight | TimeAxisViewItem::FullWidthNameHighlight); diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc index 725a6c05bf..0d69ed74d5 100644 --- a/gtk2_ardour/time_axis_view_item.cc +++ b/gtk2_ardour/time_axis_view_item.cc @@ -137,7 +137,6 @@ TimeAxisViewItem::init (const string& it_name, double spu, Gdk::Color& base_colo show_vestigial = true; visibility = vis; _sensitive = true; - name_pixbuf = 0; if (duration == 0) { warning << "Time Axis Item Duration == 0" << endl ; @@ -227,7 +226,10 @@ TimeAxisViewItem::init (const string& it_name, double spu, Gdk::Color& base_colo name_pixbuf->property_x() = NAME_X_OFFSET; name_pixbuf->property_y() = trackview.current_height() - 1.0 - NAME_Y_OFFSET; + } else { + name_pixbuf = 0; } + set_color (base_color) ; set_duration (item_duration, this) ; |