summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gtk2_ardour/audio_streamview.cc8
-rw-r--r--gtk2_ardour/automation_streamview.cc2
-rw-r--r--gtk2_ardour/midi_streamview.cc8
-rw-r--r--gtk2_ardour/streamview.cc21
-rw-r--r--gtk2_ardour/streamview.h7
5 files changed, 26 insertions, 20 deletions
diff --git a/gtk2_ardour/audio_streamview.cc b/gtk2_ardour/audio_streamview.cc
index 7c76cd7876..65efd9654c 100644
--- a/gtk2_ardour/audio_streamview.cc
+++ b/gtk2_ardour/audio_streamview.cc
@@ -119,16 +119,16 @@ AudioStreamView::create_region_view (boost::shared_ptr<Region> r, bool wait_for_
case NonLayered:
case Normal:
if (recording) {
- region_view = new AudioRegionView (canvas_group, _trackview, region,
+ region_view = new AudioRegionView (_canvas_group, _trackview, region,
_samples_per_unit, region_color, recording, TimeAxisViewItem::Visibility(
TimeAxisViewItem::ShowFrame | TimeAxisViewItem::HideFrameRight));
} else {
- region_view = new AudioRegionView (canvas_group, _trackview, region,
+ region_view = new AudioRegionView (_canvas_group, _trackview, region,
_samples_per_unit, region_color);
}
break;
case Destructive:
- region_view = new TapeAudioRegionView (canvas_group, _trackview, region,
+ region_view = new TapeAudioRegionView (_canvas_group, _trackview, region,
_samples_per_unit, region_color);
break;
default:
@@ -516,7 +516,7 @@ AudioStreamView::setup_rec_box ()
break;
}
- ArdourCanvas::SimpleRect * rec_rect = new Gnome::Canvas::SimpleRect (*canvas_group);
+ ArdourCanvas::SimpleRect * rec_rect = new Gnome::Canvas::SimpleRect (*_canvas_group);
rec_rect->property_x1() = xstart;
rec_rect->property_y1() = 1.0;
rec_rect->property_x2() = xend;
diff --git a/gtk2_ardour/automation_streamview.cc b/gtk2_ardour/automation_streamview.cc
index 4177e729fe..60c2e44076 100644
--- a/gtk2_ardour/automation_streamview.cc
+++ b/gtk2_ardour/automation_streamview.cc
@@ -110,7 +110,7 @@ AutomationStreamView::add_region_view_internal (boost::shared_ptr<Region> region
}
}
- region_view = new AutomationRegionView (canvas_group, _automation_view, region,
+ region_view = new AutomationRegionView (_canvas_group, _automation_view, region,
_controller->controllable()->parameter(), list,
_samples_per_unit, region_color);
diff --git a/gtk2_ardour/midi_streamview.cc b/gtk2_ardour/midi_streamview.cc
index 6fe2f01a90..826538dc50 100644
--- a/gtk2_ardour/midi_streamview.cc
+++ b/gtk2_ardour/midi_streamview.cc
@@ -71,12 +71,12 @@ MidiStreamView::MidiStreamView (MidiTimeAxisView& tv)
}
/* use a group dedicated to MIDI underlays. Audio underlays are not in this group. */
- midi_underlay_group = new ArdourCanvas::Group (*canvas_group);
+ midi_underlay_group = new ArdourCanvas::Group (*_canvas_group);
midi_underlay_group->lower_to_bottom();
/* put the note lines in the timeaxisview's group, so it
can be put below ghost regions from MIDI underlays*/
- _note_lines = new ArdourCanvas::LineSet(*canvas_group, ArdourCanvas::LineSet::Horizontal);
+ _note_lines = new ArdourCanvas::LineSet(*_canvas_group, ArdourCanvas::LineSet::Horizontal);
_note_lines->property_x1() = 0;
_note_lines->property_y1() = 0;
@@ -137,7 +137,7 @@ MidiStreamView::create_region_view (boost::shared_ptr<Region> r, bool /*wfd*/, b
return 0;
}
- RegionView* region_view = new MidiRegionView (canvas_group, _trackview, region,
+ RegionView* region_view = new MidiRegionView (_canvas_group, _trackview, region,
_samples_per_unit, region_color);
region_view->init (region_color, false);
@@ -444,7 +444,7 @@ MidiStreamView::setup_rec_box ()
xend = xstart;
fill_color = ARDOUR_UI::config()->canvasvar_RecordingRect.get();
- ArdourCanvas::SimpleRect * rec_rect = new Gnome::Canvas::SimpleRect (*canvas_group);
+ ArdourCanvas::SimpleRect * rec_rect = new Gnome::Canvas::SimpleRect (*_canvas_group);
rec_rect->property_x1() = xstart;
rec_rect->property_y1() = 1.0;
rec_rect->property_x2() = xend;
diff --git a/gtk2_ardour/streamview.cc b/gtk2_ardour/streamview.cc
index 048a3d23db..eadaa29af8 100644
--- a/gtk2_ardour/streamview.cc
+++ b/gtk2_ardour/streamview.cc
@@ -46,11 +46,12 @@ using namespace ARDOUR;
using namespace PBD;
using namespace Editing;
-StreamView::StreamView (RouteTimeAxisView& tv, ArdourCanvas::Group* group)
+StreamView::StreamView (RouteTimeAxisView& tv, ArdourCanvas::Group* background_group, ArdourCanvas::Group* canvas_group)
: _trackview (tv)
- , owns_canvas_group(group == 0)
- , _background_group (new ArdourCanvas::Group (*_trackview.canvas_background()))
- , canvas_group(group ? group : new ArdourCanvas::Group(*_trackview.canvas_display()))
+ , owns_background_group (background_group == 0)
+ , owns_canvas_group (canvas_group == 0)
+ , _background_group (background_group ? background_group : new ArdourCanvas::Group (*_trackview.canvas_background()))
+ , _canvas_group (canvas_group ? canvas_group : new ArdourCanvas::Group(*_trackview.canvas_display()))
, _samples_per_unit (_trackview.editor().get_current_zoom ())
, rec_updating(false)
, rec_active(false)
@@ -63,7 +64,7 @@ StreamView::StreamView (RouteTimeAxisView& tv, ArdourCanvas::Group* group)
{
/* set_position() will position the group */
- canvas_rect = new ArdourCanvas::SimpleRect (*canvas_group);
+ canvas_rect = new ArdourCanvas::SimpleRect (*_background_group);
canvas_rect->property_x1() = 0.0;
canvas_rect->property_y1() = 0.0;
canvas_rect->property_x2() = _trackview.editor().get_physical_screen_width ();
@@ -94,8 +95,12 @@ StreamView::~StreamView ()
delete canvas_rect;
+ if (owns_background_group) {
+ delete _background_group;
+ }
+
if (owns_canvas_group) {
- delete canvas_group;
+ delete _canvas_group;
}
}
@@ -110,8 +115,8 @@ StreamView::attach ()
int
StreamView::set_position (gdouble x, gdouble y)
{
- canvas_group->property_x() = x;
- canvas_group->property_y() = y;
+ _canvas_group->property_x() = x;
+ _canvas_group->property_y() = y;
return 0;
}
diff --git a/gtk2_ardour/streamview.h b/gtk2_ardour/streamview.h
index 14b30a42fc..0bf770837f 100644
--- a/gtk2_ardour/streamview.h
+++ b/gtk2_ardour/streamview.h
@@ -77,7 +77,7 @@ public:
LayerDisplay layer_display () const { return _layer_display; }
ArdourCanvas::Group* background_group() { return _background_group; }
- ArdourCanvas::Group* canvas_item() { return canvas_group; }
+ ArdourCanvas::Group* canvas_item() { return _canvas_group; }
enum ColorTarget {
RegionColor,
@@ -116,7 +116,7 @@ public:
sigc::signal<void> HeightChanged;
protected:
- StreamView (RouteTimeAxisView&, ArdourCanvas::Group* group = NULL);
+ StreamView (RouteTimeAxisView&, ArdourCanvas::Group* background_group = 0, ArdourCanvas::Group* canvas_group = 0);
void transport_changed();
void transport_looped();
@@ -140,9 +140,10 @@ protected:
virtual void color_handler () = 0;
RouteTimeAxisView& _trackview;
+ bool owns_background_group;
bool owns_canvas_group;
ArdourCanvas::Group* _background_group;
- ArdourCanvas::Group* canvas_group;
+ ArdourCanvas::Group* _canvas_group;
ArdourCanvas::SimpleRect* canvas_rect; /* frame around the whole thing */
typedef std::list<RegionView* > RegionViewList;
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-23 21:37:15 +0000