extensive changes to PresentationInfo API

Now handles color, partially.

1 files changed, 147 insertions, 47 deletions

diff --git a/libs/ardour/presentation_info.cc b/libs/ardour/presentation_info.cc
index b992f6d5c9..5490f983be 100644
--- a/libs/ardour/presentation_info.cc
+++ b/libs/ardour/presentation_info.cc
@@ -21,6 +21,8 @@
 
 #include <cassert>
 
+#include "pbd/convert.h"
+#include "pbd/debug.h"
 #include "pbd/enumwriter.h"
 #include "pbd/error.h"
 #include "pbd/failed_constructor.h"
@@ -34,90 +36,188 @@ using namespace ARDOUR;
 using namespace PBD;
 using std::string;
 
+string PresentationInfo::state_node_name = X_("PresentationInfo");
+PBD::Signal0<void> PresentationInfo::Change;
+
+namespace ARDOUR {
+	namespace Properties {
+		PBD::PropertyDescriptor<bool>     selected;
+		PBD::PropertyDescriptor<uint32_t> order;
+		PBD::PropertyDescriptor<uint32_t> color;
+	}
+}
+
 const PresentationInfo::order_t PresentationInfo::max_order = UINT32_MAX;
 const PresentationInfo::Flag PresentationInfo::Bus = PresentationInfo::Flag (PresentationInfo::AudioBus|PresentationInfo::MidiBus);
 const PresentationInfo::Flag PresentationInfo::Track = PresentationInfo::Flag (PresentationInfo::AudioTrack|PresentationInfo::MidiTrack);
 const PresentationInfo::Flag PresentationInfo::Route = PresentationInfo::Flag (PresentationInfo::Bus|PresentationInfo::Track);
 
-PresentationInfo::PresentationInfo (std::string const & str)
+void
+PresentationInfo::make_property_quarks ()
 {
-	if (parse (str)) {
-		throw failed_constructor ();
-	}
+        Properties::selected.property_id = g_quark_from_static_string (X_("selected"));
+        DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for selected = %1\n",	Properties::selected.property_id));
+        Properties::color.property_id = g_quark_from_static_string (X_("color"));
+        DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for color = %1\n",	Properties::color.property_id));
+        Properties::order.property_id = g_quark_from_static_string (X_("order"));
+        DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for order = %1\n",	Properties::order.property_id));
 }
 
-int
-PresentationInfo::parse (string const& str)
+PresentationInfo::PresentationInfo (Flag f)
+	: _order (0)
+	, _flags (Flag (f & ~OrderSet))
+	, _color (0)
 {
-	std::stringstream s (str);
-
-	/* new school, segmented string "NNN:TYPE" */
-	string f;
-	char c;
+	/* OrderSet is not set */
+}
 
-	s >> _order;
-	/* skip colon */
-	s >> c;
-	/* grab flags */
-	s >> f;
+PresentationInfo::PresentationInfo (order_t o, Flag f)
+	: _order (o)
+	, _flags (Flag (f | OrderSet))
+	, _color (0)
+{
+	/* OrderSet is set */
+}
+PresentationInfo::PresentationInfo (PresentationInfo const& other)
+	: _order (other.order())
+	, _flags (other.flags())
+	, _color (other.color())
+{
+}
 
-	_flags = Flag (string_2_enum (f, _flags)|GroupOrderSet);
+XMLNode&
+PresentationInfo::get_state ()
+{
+	XMLNode* node = new XMLNode (state_node_name);
+	node->add_property ("order", PBD::to_string (_order, std::dec));
+	node->add_property ("flags", enum_2_string (_flags));
+	node->add_property ("color", PBD::to_string (_color, std::dec));
 
-	return 0;
+	return *node;
 }
 
 int
-PresentationInfo::parse (uint32_t n, Flag f)
+PresentationInfo::set_state (XMLNode const& node, int /* version */)
 {
-	if (n < UINT32_MAX) {
-		assert (f != Flag (0));
-		_order = n;
-		_flags = Flag (f|GroupOrderSet);
-	} else {
-		_order = (n & 0xffff);
-		_flags = Flag ((n >> 16)|GroupOrderSet);
+	if (node.name() != state_node_name) {
+		return -1;
 	}
 
-	return 0;
-}
+	XMLProperty const* prop;
+	PropertyChange pc;
 
-std::string
-PresentationInfo::to_string() const
-{
-	std::stringstream ss;
+	if ((prop = node.property (X_("order"))) != 0) {
+		order_t o = atoi (prop->value());
+		if (o != _order) {
+			pc.add (Properties::order);
+			_order = o;
+		}
+		_order = atoi (prop->value());
+	}
 
-	/* Do not save or selected hidden status, or group-order set bit */
+	if ((prop = node.property (X_("flags"))) != 0) {
+		Flag f = Flag (string_2_enum (prop->value(), f));
+		if ((f&Hidden) != (_flags&Hidden)) {
+			pc.add (Properties::hidden);
+		}
+		_flags = f;
+	}
+
+	if ((prop = node.property (X_("color"))) != 0) {
+		color_t c = atoi (prop->value());
+		if (c != _color) {
+			pc.add (Properties::order);
+			_color = c;
+		}
+	}
 
-	Flag f = Flag (_flags & ~(Hidden|Selected|GroupOrderSet));
+	send_change (PropertyChange (pc));
 
-	ss << _order << ':' << enum_2_string (f);
+	return 0;
 
-	return ss.str();
 }
 
 PresentationInfo::Flag
 PresentationInfo::get_flags (XMLNode const& node)
 {
-	const XMLProperty *prop;
 	XMLNodeList nlist = node.children ();
-	XMLNodeConstIterator niter;
-	XMLNode *child;
 
-	for (niter = nlist.begin(); niter != nlist.end(); ++niter){
-		child = *niter;
+	for (XMLNodeConstIterator niter = nlist.begin(); niter != nlist.end(); ++niter){
+		XMLNode* child = *niter;
 
-		if (child->name() == X_("PresentationInfo")) {
-			if ((prop = child->property (X_("value"))) != 0) {
-				PresentationInfo pi (prop->value());
-				return pi.flags ();
+		if (child->name() == PresentationInfo::state_node_name) {
+			XMLProperty const* prop = child->property (X_("flags"));
+			if (prop) {
+				Flag f = (Flag) string_2_enum (prop->value(), f);
+				return f;
 			}
 		}
 	}
 	return Flag (0);
 }
 
+void
+PresentationInfo::set_color (PresentationInfo::color_t c)
+{
+	if (c != _color) {
+		_color = c;
+		send_change (PropertyChange (Properties::color));
+	}
+}
+
+void
+PresentationInfo::set_selected (bool yn)
+{
+	if (yn != selected()) {
+		if (yn) {
+			_flags = Flag (_flags | Selected);
+		} else {
+			_flags = Flag (_flags & ~Selected);
+		}
+		send_change (PropertyChange (Properties::selected));
+	}
+}
+
+void
+PresentationInfo::set_hidden (bool yn)
+{
+	if (yn != hidden()) {
+
+		if (yn) {
+			_flags = Flag (_flags | Hidden);
+		} else {
+			_flags = Flag (_flags & ~Hidden);
+		}
+
+		send_change (PropertyChange (Properties::hidden));
+	}
+}
+
+void
+PresentationInfo::set_order (order_t order)
+{
+	_flags = Flag (_flags|OrderSet);
+
+	if (order != _order) {
+		_order = order;
+		send_change (PropertyChange (Properties::order));
+	}
+}
+
+PresentationInfo&
+PresentationInfo::operator= (PresentationInfo const& other)
+{
+	if (this != &other) {
+		_order = other.order();
+		_flags = other.flags();
+		_color = other.color();
+	}
+
+	return *this;
+}
+
 std::ostream&
-operator<<(std::ostream& o, ARDOUR::PresentationInfo const& rid)
+operator<<(std::ostream& o, ARDOUR::PresentationInfo const& pi)
 {
-	return o << rid.to_string ();
+	return o << pi.order() << '/' << enum_2_string (pi.flags()) << '/' << pi.color();
 }