Fix Mixbus action fc83d044f8 & 65bda27d4 rebase ordering

[ardour.git] / gtk2_ardour / axis_view.h

diff --git a/gtk2_ardour/axis_view.h b/gtk2_ardour/axis_view.h
index 7334945c2ca819ebc2d1491ad7813cf842f0930c..bacaa8410de8bfb6ff6c7d05d84ee423751ad352 100644 (file)
--- a/gtk2_ardour/axis_view.h
+++ b/gtk2_ardour/axis_view.h
@@ -32,55 +32,77 @@
 #include "ardour/session_handle.h"
 
 #include "gui_object.h"
-#include "prompter.h"
 #include "selectable.h"
 
+namespace PBD {
+       class Controllable;
+}
+
 namespace ARDOUR {
        class Session;
+       class Stripable;
+       class PresentationInfo;
 }
 
 /**
- * AxisView defines the abstract base class for time-axis trackviews and routes.
+ * AxisView defines the abstract base class for horizontal and vertical
+ * presentations of Stripables.
  *
  */
-class AxisView : public virtual Selectable, public PBD::ScopedConnectionList, public ARDOUR::SessionHandlePtr
+class AxisView : public virtual PBD::ScopedConnectionList, public virtual ARDOUR::SessionHandlePtr, public virtual Selectable
 {
-  public:
-       /** @return the track's own color */
-       Gdk::Color color () const { return _color; }
-
-       ARDOUR::Session* session() const { return _session; }
-
+public:
        virtual std::string name() const = 0;
+       virtual Gdk::Color color() const = 0;
 
        sigc::signal<void> Hiding;
-       
-       void set_old_order_key (uint32_t ok) { _old_order_key = ok; }
-       uint32_t old_order_key() const { return _old_order_key; }
+
+       virtual boost::shared_ptr<ARDOUR::Stripable> stripable() const = 0;
+       virtual boost::shared_ptr<ARDOUR::AutomationControl> control() const { return boost::shared_ptr<ARDOUR::AutomationControl>(); }
 
        virtual std::string state_id() const = 0;
        /* for now, we always return properties in string form.
-        */
+       */
        std::string gui_property (const std::string& property_name) const;
-       
-       template<typename T> void set_gui_property (const std::string& property_name, const T& value) {
-               std::stringstream s;
-               s << value;
-               property_hashtable.erase(property_name);
-               property_hashtable.emplace(property_name, s.str());
-               gui_object_state().set_property<T> (state_id(), property_name, value);
+
+       bool get_gui_property (const std::string& property_name, std::string& value) const;
+
+       template <typename T>
+               bool get_gui_property (const std::string& property_name, T& value) const
+               {
+                       std::string str = gui_property (property_name);
+
+                       if (!str.empty ()) {
+                               return PBD::string_to<T>(str, value);
+                       }
+                       return false;
+               }
+
+       void set_gui_property (const std::string& property_name, const std::string& value);
+
+       void set_gui_property (const std::string& property_name, const char* value) {
+               set_gui_property (property_name, std::string(value));
+       }
+
+       template <typename T>
+       void set_gui_property (const std::string& property_name, const T& value)
+       {
+               set_gui_property (property_name, PBD::to_string(value));
+       }
+
+       void cleanup_gui_properties () {
+               /* remove related property node from the GUI state */
+               gui_object_state().remove_node (state_id());
+               property_hashtable.clear ();
        }
 
-       bool marked_for_display () const;
+       void set_selected (bool yn);
+
+       virtual bool marked_for_display () const;
        virtual bool set_marked_for_display (bool);
 
        static GUIObjectState& gui_object_state();
        void clear_property_cache() { property_hashtable.clear(); }
-       
-  protected:
-
-       AxisView (ARDOUR::Session* sess);
-       virtual ~AxisView();
 
        /**
         * Generate a new random TrackView color, unique from those colors already used.
@@ -89,15 +111,15 @@ class AxisView : public virtual Selectable, public PBD::ScopedConnectionList, pu
         */
        static Gdk::Color unique_random_color();
 
-       Gdk::Color _color;
+protected:
+       AxisView ();
+       virtual ~AxisView();
 
        static std::list<Gdk::Color> used_colors;
 
        Gtk::Label name_label;
 
        mutable boost::unordered_map<std::string, std::string> property_hashtable;
-       uint32_t _old_order_key;
 }; /* class AxisView */
 
 #endif /* __ardour_gtk_axis_view_h__ */
-