smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-07 23:35:03 +01:00
Code Issues Projects Releases Wiki Activity

fixups for rebase of show-region-name option

Browse source
This commit is contained in:
Paul Davis 2019-05-29 17:37:48 -06:00
parent 098ff7a07e
commit 81dbb977c5
4 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gtk2_ardour/streamview.cc
View file

@ -726,7 +726,7 @@ StreamView::setup_new_rec_layer_time (boost::shared_ptr<Region> region)
} }
void void
StreamView::parameter_handler (string const & what) StreamView::parameter_changed (string const & what)
{ {
if (what == "show-region-name") { if (what == "show-region-name") {
for (RegionViewList::iterator i = region_views.begin (); i != region_views.end (); ++i) { for (RegionViewList::iterator i = region_views.begin (); i != region_views.end (); ++i) {

2
gtk2_ardour/streamview.h
View file

@ -125,7 +125,7 @@ public:
/** Emitted when the height of regions has changed */ /** Emitted when the height of regions has changed */
sigc::signal<void> ContentsHeightChanged; sigc::signal<void> ContentsHeightChanged;
virtual void parameter_handler (std::string const &); virtual void parameter_changed (std::string const &);
protected: protected:
StreamView (RouteTimeAxisView&, ArdourCanvas::Container* canvas_group = 0); StreamView (RouteTimeAxisView&, ArdourCanvas::Container* canvas_group = 0);

6
gtk2_ardour/time_axis_view.cc
View file

@ -1192,16 +1192,16 @@ TimeAxisView::color_handler ()
} }
void 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 ()) { if (selected ()) {
show_selection (_editor.get_selection().time); show_selection (_editor.get_selection().time);
} }
} }
if (view()) { if (view()) {
view()->parameter_handler (what); view()->parameter_changed (what_changed);
} }
} }

2
gtk2_ardour/time_axis_view.h
View file

@ -306,8 +306,6 @@ protected:
void color_handler (); void color_handler ();
void parameter_changed (std::string const &); void parameter_changed (std::string const &);
virtual void parameter_handler (std::string const &);
void conditionally_add_to_selection (); void conditionally_add_to_selection ();
void build_size_menu (); void build_size_menu ();