ardour/livetrax
13
0
Fork 0
Code

tweaks to GhostRegion to prepare for possible inheritance

Browse Source
This commit is contained in:
Paul Davis 2022-12-27 14:25:03 -07:00
parent ba2f9411e2
commit e54e8f3f4c
2 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
gtk2_ardour/ghostregion.cc
View File

@ -56,23 +56,22 @@ GhostRegion::GhostRegion (RegionView& rv,
TimeAxisView& tv,
TimeAxisView& source_tv,
double initial_pos)
: parent_rv(rv)
, trackview(tv)
, source_trackview(source_tv)
: parent_rv (rv)
, trackview (tv)
, source_trackview (source_tv)
, base_rect (0)
{
group = new ArdourCanvas::Container (parent);
CANVAS_DEBUG_NAME (group, "ghost region");
group->set_position (ArdourCanvas::Duple (initial_pos, 0));
base_rect = new ArdourCanvas::Rectangle (group);
CANVAS_DEBUG_NAME (base_rect, "ghost region rect");
base_rect->set_x0 (0);
base_rect->set_y0 (1.0);
base_rect->set_y1 (trackview.current_height());
base_rect->set_outline (false);
if (!is_automation_ghost()) {
base_rect->hide();
if (is_automation_ghost()) {
base_rect = new ArdourCanvas::Rectangle (group);
CANVAS_DEBUG_NAME (base_rect, "ghost region rect");
base_rect->set_x0 (0);
base_rect->set_y0 (1.0);
base_rect->set_y1 (trackview.current_height());
base_rect->set_outline (false);
}
GhostRegion::set_colors();
@ -93,13 +92,17 @@ GhostRegion::~GhostRegion ()
void
GhostRegion::set_duration (double units)
{
base_rect->set_x1 (units);
if (base_rect) {
base_rect->set_x1 (units);
}
}
void
GhostRegion::set_height ()
{
base_rect->set_y1 (trackview.current_height());
if (base_rect) {
base_rect->set_y1 (trackview.current_height());
}
}
void
@ -194,7 +197,9 @@ MidiGhostRegion::MidiGhostRegion(MidiRegionView& rv,
{
_outline = UIConfiguration::instance().color ("ghost track midi outline");
base_rect->lower_to_bottom();
if (base_rect) {
base_rect->lower_to_bottom();
}
}
MidiGhostRegion::~MidiGhostRegion()

2
gtk2_ardour/ghostregion.h
View File

@ -41,7 +41,7 @@ class TimeAxisView;
class RegionView;
class MidiRegionView;
class GhostRegion : public sigc::trackable
class GhostRegion : virtual public sigc::trackable
{
public:
GhostRegion(RegionView& rv,