From 7e66535c84ca5bb3c00c289991ec152749b3734e Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 24 Aug 2017 22:37:16 -0400 Subject: [PATCH] follow libcanvas API changes related to Item::clear --- gtk2_ardour/color_theme_manager.cc | 6 +++--- gtk2_ardour/ghostregion.cc | 2 +- gtk2_ardour/midi_region_view.cc | 2 +- gtk2_ardour/midi_streamview.cc | 6 +++--- gtk2_ardour/tempo_lines.cc | 10 +++++----- libs/surfaces/push2/level_meter.cc | 8 +++++--- 6 files changed, 18 insertions(+), 16 deletions(-) diff --git a/gtk2_ardour/color_theme_manager.cc b/gtk2_ardour/color_theme_manager.cc index c9ee7ac308..17f954ada5 100644 --- a/gtk2_ardour/color_theme_manager.cc +++ b/gtk2_ardour/color_theme_manager.cc @@ -170,8 +170,8 @@ ColorThemeManager::ColorThemeManager () ColorThemeManager::~ColorThemeManager () { - if (palette_group) { - palette_group->clear (true); + if (palette_group) { + palette_group->clear_children (true); delete palette_group; } } @@ -318,7 +318,7 @@ ColorThemeManager::build_palette_canvas (ArdourCanvas::Canvas& canvas, ArdourCan /* clear existing rects and delete them */ - group.clear (true); + group.clear_children (true); for (uint32_t y = 0; y < height - box_size && color_num < color_limit; y += box_size) { for (uint32_t x = 0; x < width - box_size && color_num < color_limit; x += box_size) { diff --git a/gtk2_ardour/ghostregion.cc b/gtk2_ardour/ghostregion.cc index b531bd9aa8..56c51f0d76 100644 --- a/gtk2_ardour/ghostregion.cc +++ b/gtk2_ardour/ghostregion.cc @@ -369,7 +369,7 @@ MidiGhostRegion::add_note (NoteBase* n) void MidiGhostRegion::clear_events() { - _note_group->clear (true); + _note_group->clear_children (true); events.clear (); _optimization_iterator = events.end(); } diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc index 9d5a6f86e6..47d1843407 100644 --- a/gtk2_ardour/midi_region_view.cc +++ b/gtk2_ardour/midi_region_view.cc @@ -977,7 +977,7 @@ MidiRegionView::clear_events () } - _note_group->clear (true); + _note_group->clear_children (true); _events.clear(); _patch_changes.clear(); _sys_exes.clear(); diff --git a/gtk2_ardour/midi_streamview.cc b/gtk2_ardour/midi_streamview.cc index d3a316194d..a9d79b6654 100644 --- a/gtk2_ardour/midi_streamview.cc +++ b/gtk2_ardour/midi_streamview.cc @@ -316,7 +316,7 @@ MidiStreamView::draw_note_lines() double prev_y = .5; uint32_t color; - _note_lines->clear(); + _note_lines->clear_lines(); if (child_height() < 140 || note_height() < 3) { /* track is too small for note lines, or there are too many */ @@ -336,7 +336,7 @@ MidiStreamView::draw_note_lines() */ if (i <= highest_note()) { - _note_lines->add (y, 1.0, UIConfiguration::instance().color ("piano roll black outline")); + _note_lines->add_line (y, 1.0, UIConfiguration::instance().color ("piano roll black outline")); } /* now add a thicker line/bar which covers the entire vertical @@ -360,7 +360,7 @@ MidiStreamView::draw_note_lines() double mid = y + (h/2.0); if (mid >= 0 && h > 1.0) { - _note_lines->add (mid, h, color); + _note_lines->add_line (mid, h, color); } prev_y = y; diff --git a/gtk2_ardour/tempo_lines.cc b/gtk2_ardour/tempo_lines.cc index 8d1d183d3a..5bb21e4cba 100644 --- a/gtk2_ardour/tempo_lines.cc +++ b/gtk2_ardour/tempo_lines.cc @@ -45,7 +45,7 @@ TempoLines::~TempoLines () void TempoLines::tempo_map_changed (framepos_t new_origin) { - lines.clear (); + lines.clear_lines (); _bfc->set_origin_b (new_origin); } @@ -83,7 +83,7 @@ TempoLines::draw_ticks (std::vector& grid, const framepos_t f = _bfc->to (Evoral::Beats (grid.begin()->qn + (l / (double) divisions))) + _bfc->origin_b(); if (f > leftmost_frame) { - lines.add (PublicEditor::instance().sample_to_pixel_unrounded (f), 1.0, c); + lines.add_line (PublicEditor::instance().sample_to_pixel_unrounded (f), 1.0, c); } } } @@ -138,7 +138,7 @@ TempoLines::draw (std::vector& grid, if (beat_density > 2.0f) { /* if the lines are too close together, they become useless */ - lines.clear (); + lines.clear_lines (); return; } @@ -147,7 +147,7 @@ TempoLines::draw (std::vector& grid, divisions /= 2; } - lines.clear (); + lines.clear_lines (); if (beat_density <= 0.12 && grid.begin() != grid.end() && grid.begin()->frame > 0 && !all_bars) { /* draw subdivisions of the beat before the first visible beat line XX this shouldn't happen now */ std::vector vec; @@ -173,7 +173,7 @@ TempoLines::draw (std::vector& grid, ArdourCanvas::Coord xpos = PublicEditor::instance().sample_to_pixel_unrounded ((*i).frame); - lines.add (xpos, 1.0, color); + lines.add_line (xpos, 1.0, color); if (beat_density <= 0.12 && !all_bars) { /* draw subdivisions of this beat */ diff --git a/libs/surfaces/push2/level_meter.cc b/libs/surfaces/push2/level_meter.cc index 212644ae0c..cefb874bce 100644 --- a/libs/surfaces/push2/level_meter.cc +++ b/libs/surfaces/push2/level_meter.cc @@ -60,9 +60,11 @@ LevelMeter::LevelMeter (Push2& p, Item* parent, int len, Meter::Orientation o) Config->ParameterChanged.connect (_parameter_connection, invalidator(*this), boost::bind (&LevelMeter::parameter_changed, this, _1), &p2); if (_meter_orientation == Meter::Vertical) { - meter_packer = new HBox (this); + meter_packer = new HBox (_canvas); + add (meter_packer); } else { - meter_packer = new VBox (this); + meter_packer = new VBox (_canvas); + add (meter_packer); } meter_packer->set_collapse_on_hide (true); @@ -492,7 +494,7 @@ LevelMeter::set_type(MeterType t) void LevelMeter::clear_meters (bool reset_highlight) { for (vector::iterator i = meters.begin(); i < meters.end(); i++) { - (*i).meter->clear(); + (*i).meter->clear_display(); (*i).max_peak = minus_infinity(); if (reset_highlight) (*i).meter->set_highlight(false);