fix up ordering/timing of naming for TimeAxisViewItem (so that canvas debugging...

diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc
index 23c17476d3470881620e3838c523bf8a10afe859..6a898855bd70f8237fbffe722d5d1590087088f2 100644 (file)
--- 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 054d496013d097455f6c43ab2aad0d9c8ad95938..6a81080e96fe65007383c016d964a9a120a71acd 100644 (file)
--- 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*);