remove use of TimeRectangle

diff --git a/gtk2_ardour/ghostregion.cc b/gtk2_ardour/ghostregion.cc
index 125b75987977a70e073ead5cef6dd9f1596bb90c..6f4b56eed91572d1b56784c945b176dd9c7baac0 100644 (file)
--- a/gtk2_ardour/ghostregion.cc
+++ b/gtk2_ardour/ghostregion.cc
@@ -48,7 +48,7 @@ GhostRegion::GhostRegion (ArdourCanvas::Container* parent, TimeAxisView& tv, Tim
        CANVAS_DEBUG_NAME (group, "ghost region");
        group->set_position (ArdourCanvas::Duple (initial_pos, 0));
 
-       base_rect = new ArdourCanvas::TimeRectangle (group);
+       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);

diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc
index cc579ba3a449cb0c30542f202e0cc446440f3535..5ef7549a9fcc35eeb9413a4f6a87ca5a7e683184 100644 (file)
--- a/gtk2_ardour/marker.cc
+++ b/gtk2_ardour/marker.cc
@@ -256,7 +256,7 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Container& parent, guint32 rgba,
        group->name = string_compose ("Marker::group for %1", annotation);
 #endif 
 
-       _name_background = new ArdourCanvas::TimeRectangle (group);
+       _name_background = new ArdourCanvas::Rectangle (group);
 #ifdef CANVAS_DEBUG
        _name_background->name = string_compose ("Marker::_name_background for %1", annotation);
 #endif 

diff --git a/gtk2_ardour/note.cc b/gtk2_ardour/note.cc
index bc10d79d8b0c4ab4cd9eb37fdd6c72a72a24ffc9..ea12712e4a313e55fe408e8c5ebdf0ebca65c5c1 100644 (file)
--- a/gtk2_ardour/note.cc
+++ b/gtk2_ardour/note.cc
@@ -32,7 +32,7 @@ using namespace ArdourCanvas;
 Note::Note (
        MidiRegionView& region, Item* parent, const boost::shared_ptr<NoteType> note, bool with_events)
        : NoteBase (region, with_events, note)
-       , _rectangle (new ArdourCanvas::TimeRectangle (parent))
+       , _rectangle (new ArdourCanvas::Rectangle (parent))
 {
        CANVAS_DEBUG_NAME (_rectangle, "note");
        set_item (_rectangle);

diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc
index 735e5dd09c36d81779c5a3803c7ad3886b309090..be96cd4058bb0b4fbbec286abd7aaae57eecaacd 100644 (file)
--- a/gtk2_ardour/region_view.cc
+++ b/gtk2_ardour/region_view.cc
@@ -238,7 +238,7 @@ RegionView::set_silent_frames (const AudioIntervalResult& silences, double /*thr
 
        for (AudioIntervalResult::const_iterator i = silences.begin(); i != silences.end(); ++i) {
 
-               ArdourCanvas::Rectangle* cr = new ArdourCanvas::TimeRectangle (group);
+               ArdourCanvas::Rectangle* cr = new ArdourCanvas::Rectangle (group);
                cr->set_ignore_events (true);
                _silent_frames.push_back (cr);
 
@@ -800,7 +800,7 @@ RegionView::update_coverage_frames (LayerDisplay d)
 
                /* start off any new rect, if required */
                if (cr == 0 || me != new_me) {
-                       cr = new ArdourCanvas::TimeRectangle (group);
+                       cr = new ArdourCanvas::Rectangle (group);
                        _coverage_frames.push_back (cr);
                        cr->set_x0 (trackview.editor().sample_to_pixel (t - position));
                        cr->set_y0 (1);

diff --git a/gtk2_ardour/streamview.cc b/gtk2_ardour/streamview.cc
index 1d50a06a2ef6b4bf3d27a1f862e702cf7e958cc2..fa3ed357bc62bb2745a85872e81ae6b5fcefc487 100644 (file)
--- a/gtk2_ardour/streamview.cc
+++ b/gtk2_ardour/streamview.cc
@@ -412,7 +412,7 @@ StreamView::create_rec_box(framepos_t frame_pos, double width)
        const double   xend       = xstart + width;
        const uint32_t fill_color = ARDOUR_UI::config()->color_mod("recording rect", "recording_rect");
 
-       ArdourCanvas::Rectangle* rec_rect = new ArdourCanvas::TimeRectangle(_canvas_group);
+       ArdourCanvas::Rectangle* rec_rect = new ArdourCanvas::Rectangle(_canvas_group);
        rec_rect->set_x0(xstart);
        rec_rect->set_y0(0);
        rec_rect->set_x1(xend);

diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc
index 3032d834bfda4bacbef7fc21b9e17831d623195d..a117bb64c1060424be547f2426edfb33fcf4dbb2 100644 (file)
--- a/gtk2_ardour/time_axis_view.cc
+++ b/gtk2_ardour/time_axis_view.cc
@@ -1028,7 +1028,7 @@ TimeAxisView::get_selection_rect (uint32_t id)
 
                rect = new SelectionRect;
 
-               rect->rect = new ArdourCanvas::TimeRectangle (selection_group);
+               rect->rect = new ArdourCanvas::Rectangle (selection_group);
                CANVAS_DEBUG_NAME (rect->rect, "selection rect");
                rect->rect->set_outline (false);
                rect->rect->set_fill_color (ARDOUR_UI::config()->color_mod ("selection rect", "selection rect"));

diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc
index 5489129f6eb3a1112293a7237180a3a1ec44b61d..9a0e37708d79aa3f7d8af2fa13bc414531a332b0 100644 (file)
--- a/gtk2_ardour/time_axis_view_item.cc
+++ b/gtk2_ardour/time_axis_view_item.cc
@@ -191,7 +191,7 @@ TimeAxisViewItem::init (ArdourCanvas::Item* parent, double fpp, uint32_t base_co
        }
 
        if (visibility & ShowFrame) {
-               frame = new ArdourCanvas::TimeRectangle (group, 
+               frame = new ArdourCanvas::Rectangle (group, 
                                                     ArdourCanvas::Rect (0.0, 0.0, 
                                                                         trackview.editor().sample_to_pixel(duration), 
                                                                         trackview.current_height()));
@@ -513,7 +513,7 @@ TimeAxisViewItem::set_selected(bool yn)
 
        if (_selected && frame) {
                if (!selection_frame) {
-                       selection_frame = new ArdourCanvas::TimeRectangle (group);
+                       selection_frame = new ArdourCanvas::Rectangle (group);
                        selection_frame->set_fill (false);
                        selection_frame->set_outline_color (ARDOUR_UI::config()->color ("selected time axis frame"));
                        selection_frame->set_ignore_events (true);
@@ -842,7 +842,7 @@ TimeAxisViewItem::reset_width_dependent_items (double pixel_width)
                if (show_vestigial) {
 
                        if (!vestigial_frame) {
-                               vestigial_frame = new ArdourCanvas::TimeRectangle (group, ArdourCanvas::Rect (0.0, 0.0, 2.0, trackview.current_height()));
+                               vestigial_frame = new ArdourCanvas::Rectangle (group, ArdourCanvas::Rect (0.0, 0.0, 2.0, trackview.current_height()));
                                CANVAS_DEBUG_NAME (vestigial_frame, string_compose ("vestigial frame for %1", get_item_name()));
                                vestigial_frame->set_outline_color (ARDOUR_UI::config()->color ("vestigial frame"));
                                vestigial_frame->set_fill_color (ARDOUR_UI::config()->color ("vestigial frame"));