Put the sidechain ports into a dedicated tab in PortMatrix

[ardour.git] / gtk2_ardour / axis_view.cc

diff --git a/gtk2_ardour/axis_view.cc b/gtk2_ardour/axis_view.cc
index 25a190729516dc4650d424446b4748cc5bbfe680..ebcca2a91443030d7c876da754ea8ca70da10592 100644 (file)
--- a/gtk2_ardour/axis_view.cc
+++ b/gtk2_ardour/axis_view.cc
@@ -29,15 +29,17 @@
 #include "pbd/convert.h"
 
 #include <gtkmm2ext/utils.h>
-#include <gtkmm2ext/selector.h>
 #include <gtkmm2ext/gtk_ui.h>
 
+#include "ardour/selection.h"
+
 #include "public_editor.h"
 #include "ardour_ui.h"
 #include "gui_object.h"
 #include "axis_view.h"
 #include "utils.h"
-#include "i18n.h"
+
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace Gtk;
@@ -67,29 +69,54 @@ AxisView::gui_property (const string& property_name) const
        if (property_hashtable.count(property_name)) {
                return property_hashtable[property_name];
        } else {
-         string rv = gui_object_state().get_string (state_id(), property_name);
+               string rv = gui_object_state().get_string (state_id(), property_name);
                property_hashtable.erase(property_name);
                property_hashtable.emplace(property_name, rv);
                return rv;
        }
 }
 
+bool
+AxisView::get_gui_property (const std::string& property_name, std::string& value) const
+{
+       std::string str = gui_property(property_name);
+
+       if (!str.empty()) {
+               value = str;
+               return true;
+       }
+
+       return false;
+}
+
+void
+AxisView::set_gui_property (const std::string& property_name, const std::string& value)
+{
+       property_hashtable.erase (property_name);
+       property_hashtable.emplace (property_name, value);
+       gui_object_state ().set_property (state_id (), property_name, value);
+}
+
 bool
 AxisView::marked_for_display () const
 {
-       string const v = gui_property ("visible");
-       return (v == "" || PBD::string_is_affirmative (v));
+       bool visible;
+       if (!get_gui_property ("visible", visible)) {
+               return true;
+       }
+       return visible;
 }
 
 bool
 AxisView::set_marked_for_display (bool yn)
 {
-       string const v = gui_property ("visible");
-       if (v == "" || yn != PBD::string_is_affirmative (v)) {
-               set_gui_property ("visible", yn);
-               return true; // things changed
+       bool visible;
+       if (get_gui_property ("visible", visible) && visible == yn) {
+               return false; // nothing changed
        }
-       return false;
+
+       set_gui_property ("visible", yn);
+       return true; // things changed
 }
 
 GUIObjectState&
@@ -97,3 +124,13 @@ AxisView::gui_object_state()
 {
        return *ARDOUR_UI::instance()->gui_object_state;
 }
+
+void
+AxisView::set_selected (bool yn)
+{
+       if (selected() == yn) {
+               return;
+       }
+
+       Selectable::set_selected (yn);
+}