ardour/livetrax
13
0
Fork 0
Code

remove use of TimeRectangle

Browse Source
This commit is contained in:
Paul Davis 2015-02-11 21:56:44 -05:00
parent a992a2e6e0
commit 11cfdd4c6d
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/ghostregion.cc
View File

@ -48,7 +48,7 @@ GhostRegion::GhostRegion (ArdourCanvas::Container* parent, TimeAxisView& tv, Tim
CANVAS_DEBUG_NAME (group, "ghost region"); CANVAS_DEBUG_NAME (group, "ghost region");
group->set_position (ArdourCanvas::Duple (initial_pos, 0)); 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"); CANVAS_DEBUG_NAME (base_rect, "ghost region rect");
base_rect->set_x0 (0); base_rect->set_x0 (0);
base_rect->set_y0 (1.0); base_rect->set_y0 (1.0);

2
gtk2_ardour/marker.cc
View File

@ -256,7 +256,7 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Container& parent, guint32 rgba,
group->name = string_compose ("Marker::group for %1", annotation); group->name = string_compose ("Marker::group for %1", annotation);
#endif #endif
_name_background = new ArdourCanvas::TimeRectangle (group); _name_background = new ArdourCanvas::Rectangle (group);
#ifdef CANVAS_DEBUG #ifdef CANVAS_DEBUG
_name_background->name = string_compose ("Marker::_name_background for %1", annotation); _name_background->name = string_compose ("Marker::_name_background for %1", annotation);
#endif #endif

2
gtk2_ardour/note.cc
View File

@ -32,7 +32,7 @@ using namespace ArdourCanvas;
Note::Note ( Note::Note (
MidiRegionView& region, Item* parent, const boost::shared_ptr<NoteType> note, bool with_events) MidiRegionView& region, Item* parent, const boost::shared_ptr<NoteType> note, bool with_events)
: NoteBase (region, with_events, note) : NoteBase (region, with_events, note)
, _rectangle (new ArdourCanvas::TimeRectangle (parent)) , _rectangle (new ArdourCanvas::Rectangle (parent))
{ {
CANVAS_DEBUG_NAME (_rectangle, "note"); CANVAS_DEBUG_NAME (_rectangle, "note");
set_item (_rectangle); set_item (_rectangle);

4
gtk2_ardour/region_view.cc
View File

@ -238,7 +238,7 @@ RegionView::set_silent_frames (const AudioIntervalResult& silences, double /*thr
for (AudioIntervalResult::const_iterator i = silences.begin(); i != silences.end(); ++i) { 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); cr->set_ignore_events (true);
_silent_frames.push_back (cr); _silent_frames.push_back (cr);
@ -800,7 +800,7 @@ RegionView::update_coverage_frames (LayerDisplay d)
/* start off any new rect, if required */ /* start off any new rect, if required */
if (cr == 0 || me != new_me) { if (cr == 0 || me != new_me) {
cr = new ArdourCanvas::TimeRectangle (group); cr = new ArdourCanvas::Rectangle (group);
_coverage_frames.push_back (cr); _coverage_frames.push_back (cr);
cr->set_x0 (trackview.editor().sample_to_pixel (t - position)); cr->set_x0 (trackview.editor().sample_to_pixel (t - position));
cr->set_y0 (1); cr->set_y0 (1);

2
gtk2_ardour/streamview.cc
View File

@ -412,7 +412,7 @@ StreamView::create_rec_box(framepos_t frame_pos, double width)
const double xend = xstart + width; const double xend = xstart + width;
const uint32_t fill_color = ARDOUR_UI::config()->color_mod("recording rect", "recording_rect"); 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_x0(xstart);
rec_rect->set_y0(0); rec_rect->set_y0(0);
rec_rect->set_x1(xend); rec_rect->set_x1(xend);

2
gtk2_ardour/time_axis_view.cc
View File

@ -1028,7 +1028,7 @@ TimeAxisView::get_selection_rect (uint32_t id)
rect = new SelectionRect; rect = new SelectionRect;
rect->rect = new ArdourCanvas::TimeRectangle (selection_group); rect->rect = new ArdourCanvas::Rectangle (selection_group);
CANVAS_DEBUG_NAME (rect->rect, "selection rect"); CANVAS_DEBUG_NAME (rect->rect, "selection rect");
rect->rect->set_outline (false); rect->rect->set_outline (false);
rect->rect->set_fill_color (ARDOUR_UI::config()->color_mod ("selection rect", "selection rect")); rect->rect->set_fill_color (ARDOUR_UI::config()->color_mod ("selection rect", "selection rect"));

6
gtk2_ardour/time_axis_view_item.cc
View File

@ -191,7 +191,7 @@ TimeAxisViewItem::init (ArdourCanvas::Item* parent, double fpp, uint32_t base_co
} }
if (visibility & ShowFrame) { if (visibility & ShowFrame) {
frame = new ArdourCanvas::TimeRectangle (group, frame = new ArdourCanvas::Rectangle (group,
ArdourCanvas::Rect (0.0, 0.0, ArdourCanvas::Rect (0.0, 0.0,
trackview.editor().sample_to_pixel(duration), trackview.editor().sample_to_pixel(duration),
trackview.current_height())); trackview.current_height()));
@ -513,7 +513,7 @@ TimeAxisViewItem::set_selected(bool yn)
if (_selected && frame) { if (_selected && frame) {
if (!selection_frame) { if (!selection_frame) {
selection_frame = new ArdourCanvas::TimeRectangle (group); selection_frame = new ArdourCanvas::Rectangle (group);
selection_frame->set_fill (false); selection_frame->set_fill (false);
selection_frame->set_outline_color (ARDOUR_UI::config()->color ("selected time axis frame")); selection_frame->set_outline_color (ARDOUR_UI::config()->color ("selected time axis frame"));
selection_frame->set_ignore_events (true); selection_frame->set_ignore_events (true);
@ -842,7 +842,7 @@ TimeAxisViewItem::reset_width_dependent_items (double pixel_width)
if (show_vestigial) { if (show_vestigial) {
if (!vestigial_frame) { 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())); 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_outline_color (ARDOUR_UI::config()->color ("vestigial frame"));
vestigial_frame->set_fill_color (ARDOUR_UI::config()->color ("vestigial frame")); vestigial_frame->set_fill_color (ARDOUR_UI::config()->color ("vestigial frame"));