From 81dbb977c505bd2b1dd7b24be70931e52e18a171 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 29 May 2019 17:37:48 -0600 Subject: fixups for rebase of show-region-name option --- gtk2_ardour/streamview.cc | 2 +- gtk2_ardour/streamview.h | 2 +- gtk2_ardour/time_axis_view.cc | 6 +++--- gtk2_ardour/time_axis_view.h | 2 -- 4 files changed, 5 insertions(+), 7 deletions(-) (limited to 'gtk2_ardour') diff --git a/gtk2_ardour/streamview.cc b/gtk2_ardour/streamview.cc index 339973ff61..503ff68db6 100644 --- a/gtk2_ardour/streamview.cc +++ b/gtk2_ardour/streamview.cc @@ -726,7 +726,7 @@ StreamView::setup_new_rec_layer_time (boost::shared_ptr region) } void -StreamView::parameter_handler (string const & what) +StreamView::parameter_changed (string const & what) { if (what == "show-region-name") { for (RegionViewList::iterator i = region_views.begin (); i != region_views.end (); ++i) { diff --git a/gtk2_ardour/streamview.h b/gtk2_ardour/streamview.h index a671b2e0f3..dd4762bc52 100644 --- a/gtk2_ardour/streamview.h +++ b/gtk2_ardour/streamview.h @@ -125,7 +125,7 @@ public: /** Emitted when the height of regions has changed */ sigc::signal ContentsHeightChanged; - virtual void parameter_handler (std::string const &); + virtual void parameter_changed (std::string const &); protected: StreamView (RouteTimeAxisView&, ArdourCanvas::Container* canvas_group = 0); diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc index 86eda55974..ed097f0aa6 100644 --- a/gtk2_ardour/time_axis_view.cc +++ b/gtk2_ardour/time_axis_view.cc @@ -1192,16 +1192,16 @@ TimeAxisView::color_handler () } void -TimeAxisView::parameter_changed (string const & p) +TimeAxisView::parameter_changed (string const & what_changed) { - if (p == "vertical-region-gap") { + if (what_changed == "vertical-region-gap") { if (selected ()) { show_selection (_editor.get_selection().time); } } if (view()) { - view()->parameter_handler (what); + view()->parameter_changed (what_changed); } } diff --git a/gtk2_ardour/time_axis_view.h b/gtk2_ardour/time_axis_view.h index 00f1fafb48..0a6444022d 100644 --- a/gtk2_ardour/time_axis_view.h +++ b/gtk2_ardour/time_axis_view.h @@ -306,8 +306,6 @@ protected: void color_handler (); void parameter_changed (std::string const &); - virtual void parameter_handler (std::string const &); - void conditionally_add_to_selection (); void build_size_menu (); -- cgit v1.2.3