From a3dd948c020d4da778c325201e62054347935ddc Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Fri, 28 Jul 2017 02:12:19 +0200 Subject: Allow to rename VCAs in the editor --- gtk2_ardour/time_axis_view.cc | 2 +- gtk2_ardour/time_axis_view.h | 1 + gtk2_ardour/vca_time_axis.cc | 7 +++++++ gtk2_ardour/vca_time_axis.h | 2 ++ 4 files changed, 11 insertions(+), 1 deletion(-) (limited to 'gtk2_ardour') diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc index b03a0c03bd..1dd61338a5 100644 --- a/gtk2_ardour/time_axis_view.cc +++ b/gtk2_ardour/time_axis_view.cc @@ -619,7 +619,7 @@ TimeAxisView::begin_name_edit () } Gtk::Window* toplevel = (Gtk::Window*) control_parent->get_toplevel(); - FloatingTextEntry* fte = new FloatingTextEntry (toplevel, name_label.get_text ()); + FloatingTextEntry* fte = new FloatingTextEntry (toplevel, name ()); fte->set_name ("TrackNameEditor"); fte->use_text.connect (sigc::mem_fun (*this, &TimeAxisView::end_name_edit)); diff --git a/gtk2_ardour/time_axis_view.h b/gtk2_ardour/time_axis_view.h index ac67169a7e..99ed2f37fc 100644 --- a/gtk2_ardour/time_axis_view.h +++ b/gtk2_ardour/time_axis_view.h @@ -257,6 +257,7 @@ class TimeAxisView : public virtual AxisView void begin_name_edit (); void end_name_edit (std::string, int); + virtual std::string name () const { return name_label.get_text (); } /* derived classes can override these */ diff --git a/gtk2_ardour/vca_time_axis.cc b/gtk2_ardour/vca_time_axis.cc index bd31c73b1a..e0e2175496 100644 --- a/gtk2_ardour/vca_time_axis.cc +++ b/gtk2_ardour/vca_time_axis.cc @@ -210,6 +210,13 @@ VCATimeAxisView::update_vca_name () name_label.set_text (_vca->full_name()); } +bool +VCATimeAxisView::name_entry_changed (std::string const& str) +{ + _vca->set_name (str); + return true; +} + void VCATimeAxisView::update_mute_display () { diff --git a/gtk2_ardour/vca_time_axis.h b/gtk2_ardour/vca_time_axis.h index 9620310237..550b29b6ce 100644 --- a/gtk2_ardour/vca_time_axis.h +++ b/gtk2_ardour/vca_time_axis.h @@ -78,6 +78,8 @@ protected: virtual void build_automation_action_menu (bool); Gtk::Menu* automation_action_menu; + bool name_entry_changed (std::string const&); + void parameter_changed (std::string const& p); void vca_property_changed (PBD::PropertyChange const&); void update_vca_name (); -- cgit v1.2.3