Prevent endless read of silent files

[ardour.git] / gtk2_ardour / axis_view.cc

diff --git a/gtk2_ardour/axis_view.cc b/gtk2_ardour/axis_view.cc
index 5e0a50fdf7d2a2977827cb901fb026a73a71497f..ebcca2a91443030d7c876da754ea8ca70da10592 100644 (file)
--- a/gtk2_ardour/axis_view.cc
+++ b/gtk2_ardour/axis_view.cc
@@ -26,32 +26,31 @@
 #include <list>
 
 #include "pbd/error.h"
+#include "pbd/convert.h"
 
 #include <gtkmm2ext/utils.h>
-#include <gtkmm2ext/selector.h>
 #include <gtkmm2ext/gtk_ui.h>
 
-#include "ardour/session.h"
-#include "ardour/utils.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;
 using namespace Gtkmm2ext;
 using namespace ARDOUR;
+using namespace ARDOUR_UI_UTILS;
 
 list<Gdk::Color> AxisView::used_colors;
 
-AxisView::AxisView (ARDOUR::Session* sess)
-       : SessionHandlePtr (sess)
+AxisView::AxisView ()
 {
-       _selected = false;
 }
 
 AxisView::~AxisView()
@@ -67,30 +66,71 @@ AxisView::unique_random_color()
 string
 AxisView::gui_property (const string& property_name) const
 {
-       return gui_object_state().get_string (state_id(), property_name);
+       if (property_hashtable.count(property_name)) {
+               return property_hashtable[property_name];
+       } else {
+               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 == "" || 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 != 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&
-AxisView::gui_object_state() 
+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);
+}