diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-10-25 13:30:01 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-10-25 13:30:01 -0400 |
| commit | b00751d0dca9e2dbb4d97a7f93cd4f63f76d8c81 (patch) | |
| tree | 4a2af07a389610ccb9582908ab3efbcc6f915914 | |
| parent | 5ebc4a99be2ae91f7378c08e582e14b55d187ec8 (diff) | |
fix up ordering/timing of naming for TimeAxisViewItem (so that canvas debugging is more useful)
| -rw-r--r-- | gtk2_ardour/time_axis_view_item.cc | 10 | ||||
| -rw-r--r-- | gtk2_ardour/time_axis_view_item.h | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc index 23c17476d3..6a898855bd 100644 --- a/gtk2_ardour/time_axis_view_item.cc +++ b/gtk2_ardour/time_axis_view_item.cc @@ -106,12 +106,14 @@ TimeAxisViewItem::TimeAxisViewItem( framepos_t start, framecnt_t duration, bool recording, bool automation, Visibility vis ) : trackview (tv) + , item_name (it_name) , _height (1.0) , _recregion (recording) , _automation (automation) , _dragging (false) + { - init (it_name, &parent, spu, base_color, start, duration, vis, true, true); + init (&parent, spu, base_color, start, duration, vis, true, true); } TimeAxisViewItem::TimeAxisViewItem (const TimeAxisViewItem& other) @@ -119,6 +121,7 @@ TimeAxisViewItem::TimeAxisViewItem (const TimeAxisViewItem& other) , Selectable (other) , PBD::ScopedConnectionList() , trackview (other.trackview) + , item_name (other.item_name) , _recregion (other._recregion) , _automation (other._automation) , _dragging (other._dragging) @@ -136,12 +139,12 @@ TimeAxisViewItem::TimeAxisViewItem (const TimeAxisViewItem& other) _selected = other._selected; - init (other.item_name, parent, other.samples_per_pixel, c, other.frame_position, + init (parent, other.samples_per_pixel, c, other.frame_position, other.item_duration, other.visibility, other.wide_enough_for_name, other.high_enough_for_name); } void -TimeAxisViewItem::init (const string& it_name, ArdourCanvas::Group* parent, double fpp, Gdk::Color const & base_color, +TimeAxisViewItem::init (ArdourCanvas::Group* parent, double fpp, Gdk::Color const & base_color, framepos_t start, framepos_t duration, Visibility vis, bool wide, bool high) { @@ -149,7 +152,6 @@ TimeAxisViewItem::init (const string& it_name, ArdourCanvas::Group* parent, doub CANVAS_DEBUG_NAME (group, string_compose ("TAVI group for %1", get_item_name())); group->Event.connect (sigc::mem_fun (*this, &TimeAxisViewItem::canvas_group_event)); - item_name = it_name; samples_per_pixel = fpp; frame_position = start; item_duration = duration; diff --git a/gtk2_ardour/time_axis_view_item.h b/gtk2_ardour/time_axis_view_item.h index 054d496013..6a81080e96 100644 --- a/gtk2_ardour/time_axis_view_item.h +++ b/gtk2_ardour/time_axis_view_item.h @@ -159,7 +159,7 @@ class TimeAxisViewItem : public Selectable, public PBD::ScopedConnectionList TimeAxisViewItem (const TimeAxisViewItem&); - void init (const std::string&, ArdourCanvas::Group*, double, Gdk::Color const &, framepos_t, framepos_t, Visibility, bool, bool); + void init (ArdourCanvas::Group*, double, Gdk::Color const &, framepos_t, framepos_t, Visibility, bool, bool); virtual bool canvas_group_event (GdkEvent*); |