smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-09 16:24:57 +01:00
Code Issues Projects Releases Wiki Activity

fix up ordering/timing of naming for TimeAxisViewItem (so that canvas debugging is more useful)

Browse source
This commit is contained in:
Paul Davis 2013-10-25 13:30:01 -04:00
parent 5ebc4a99be
commit b00751d0dc
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
gtk2_ardour/time_axis_view_item.cc
View file

@ -106,12 +106,14 @@ TimeAxisViewItem::TimeAxisViewItem(
framepos_t start, framecnt_t duration, bool recording, bool automation, Visibility vis framepos_t start, framecnt_t duration, bool recording, bool automation, Visibility vis
) )
: trackview (tv) : trackview (tv)
, item_name (it_name)
, _height (1.0) , _height (1.0)
, _recregion (recording) , _recregion (recording)
, _automation (automation) , _automation (automation)
, _dragging (false) , _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) TimeAxisViewItem::TimeAxisViewItem (const TimeAxisViewItem& other)
@ -119,6 +121,7 @@ TimeAxisViewItem::TimeAxisViewItem (const TimeAxisViewItem& other)
, Selectable (other) , Selectable (other)
, PBD::ScopedConnectionList() , PBD::ScopedConnectionList()
, trackview (other.trackview) , trackview (other.trackview)
, item_name (other.item_name)
, _recregion (other._recregion) , _recregion (other._recregion)
, _automation (other._automation) , _automation (other._automation)
, _dragging (other._dragging) , _dragging (other._dragging)
@ -136,12 +139,12 @@ TimeAxisViewItem::TimeAxisViewItem (const TimeAxisViewItem& other)
_selected = other._selected; _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); other.item_duration, other.visibility, other.wide_enough_for_name, other.high_enough_for_name);
} }
void 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, framepos_t start, framepos_t duration, Visibility vis,
bool wide, bool high) 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())); CANVAS_DEBUG_NAME (group, string_compose ("TAVI group for %1", get_item_name()));
group->Event.connect (sigc::mem_fun (*this, &TimeAxisViewItem::canvas_group_event)); group->Event.connect (sigc::mem_fun (*this, &TimeAxisViewItem::canvas_group_event));
item_name = it_name;
samples_per_pixel = fpp; samples_per_pixel = fpp;
frame_position = start; frame_position = start;
item_duration = duration; item_duration = duration;

2
gtk2_ardour/time_axis_view_item.h
View file

@ -159,7 +159,7 @@ class TimeAxisViewItem : public Selectable, public PBD::ScopedConnectionList
TimeAxisViewItem (const TimeAxisViewItem&); 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*); virtual bool canvas_group_event (GdkEvent*);