LADI
/
ardour
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix tape region view crash, remove unneeded include. 

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@5109 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Nick Mainsbridge 2009-05-22 11:58:10 +00:00
parent e8730462c2
commit 28f46b7f2c
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gtk2_ardour/region_view.h
View File

@ -29,7 +29,6 @@
#include "time_axis_view_item.h" #include "time_axis_view_item.h"
#include "automation_line.h" #include "automation_line.h"
#include "enums.h" #include "enums.h"
#include "waveview.h"
#include "canvas.h" #include "canvas.h"
class TimeAxisView; class TimeAxisView;

1
gtk2_ardour/tape_region_view.cc
View File

@ -44,6 +44,7 @@ using namespace ArdourCanvas;
const TimeAxisViewItem::Visibility TapeAudioRegionView::default_tape_visibility const TimeAxisViewItem::Visibility TapeAudioRegionView::default_tape_visibility
= TimeAxisViewItem::Visibility ( = TimeAxisViewItem::Visibility (
TimeAxisViewItem::ShowNameHighlight | TimeAxisViewItem::ShowNameHighlight |
TimeAxisViewItem::ShowNameText |
TimeAxisViewItem::ShowFrame | TimeAxisViewItem::ShowFrame |
TimeAxisViewItem::HideFrameRight | TimeAxisViewItem::HideFrameRight |
TimeAxisViewItem::FullWidthNameHighlight); TimeAxisViewItem::FullWidthNameHighlight);

4
gtk2_ardour/time_axis_view_item.cc
View File

@ -137,7 +137,6 @@ TimeAxisViewItem::init (const string& it_name, double spu, Gdk::Color& base_colo
show_vestigial = true; show_vestigial = true;
visibility = vis; visibility = vis;
_sensitive = true; _sensitive = true;
name_pixbuf = 0;
if (duration == 0) { if (duration == 0) {
warning << "Time Axis Item Duration == 0" << endl ; 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_x() = NAME_X_OFFSET;
name_pixbuf->property_y() = trackview.current_height() - 1.0 - NAME_Y_OFFSET; name_pixbuf->property_y() = trackview.current_height() - 1.0 - NAME_Y_OFFSET;
} else {
name_pixbuf = 0;
} }
set_color (base_color) ; set_color (base_color) ;
set_duration (item_duration, this) ; set_duration (item_duration, this) ;