fixups for rebase of show-region-name option
This commit is contained in:
parent
098ff7a07e
commit
81dbb977c5
|
@ -726,7 +726,7 @@ StreamView::setup_new_rec_layer_time (boost::shared_ptr<Region> 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) {
|
||||
|
|
|
@ -125,7 +125,7 @@ public:
|
|||
/** Emitted when the height of regions has changed */
|
||||
sigc::signal<void> ContentsHeightChanged;
|
||||
|
||||
virtual void parameter_handler (std::string const &);
|
||||
virtual void parameter_changed (std::string const &);
|
||||
|
||||
protected:
|
||||
StreamView (RouteTimeAxisView&, ArdourCanvas::Container* canvas_group = 0);
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -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 ();
|
||||
|
|
Loading…
Reference in New Issue