restore rec-enable, solo & mute functionality; remove all Global*Command cruft; reimplement momentary solo&mute; refactor session RT event stuff to be even cleaner and finally compatible with everything-is-a-UI idea ; make all UIs derive from a primitive type that pprovides only void call_slot (sigc::slot<void>) as a way to execute arbitrary code in the UI thread

git-svn-id: svn://localhost/ardour2/branches/3.0@6338 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 0 insertions, 425 deletions

diff --git a/libs/ardour/session_command.cc b/libs/ardour/session_command.cc
index d1ce09cbf6..4d733264fb 100644
--- a/libs/ardour/session_command.cc
+++ b/libs/ardour/session_command.cc
@@ -124,428 +124,3 @@ Session::memento_command_factory(XMLNode *n)
     return 0 ;
 }
 
-Command *
-Session::global_state_command_factory (const XMLNode& node)
-{
-	const XMLProperty* prop;
-	Command* command = 0;
-
-	if ((prop = node.property ("type")) == 0) {
-		error << _("GlobalRouteStateCommand has no \"type\" node, ignoring") << endmsg;
-		return 0;
-	}
-
-	try {
-
-		if (prop->value() == "solo") {
-			command = new GlobalSoloStateCommand (*this, node);
-		} else if (prop->value() == "mute") {
-			command = new GlobalMuteStateCommand (*this, node);
-		} else if (prop->value() == "rec-enable") {
-			command = new GlobalRecordEnableStateCommand (*this, node);
-		} else if (prop->value() == "metering") {
-			command = new GlobalMeteringStateCommand (*this, node);
-		} else {
-			error << string_compose (_("unknown type of GlobalRouteStateCommand (%1), ignored"), prop->value()) << endmsg;
-		}
-	}
-
-	catch (failed_constructor& err) {
-		return 0;
-	}
-
-	return command;
-}
-
-Session::GlobalRouteStateCommand::GlobalRouteStateCommand (Session& s, void* p)
-	: sess (s), src (p)
-{
-}
-
-Session::GlobalRouteStateCommand::GlobalRouteStateCommand (Session& s, const XMLNode& node)
-	: sess (s), src (this)
-{
-	if (set_state (node, Stateful::loading_state_version)) {
-		throw failed_constructor ();
-	}
-}
-
-int
-Session::GlobalRouteStateCommand::set_state (const XMLNode& node, int /*version*/)
-{
-	GlobalRouteBooleanState states;
-	XMLNodeList nlist;
-	const XMLProperty* prop;
-	XMLNode* child;
-	XMLNodeConstIterator niter;
-	int loop;
-
-	before.clear ();
-	after.clear ();
-
-	for (loop = 0; loop < 2; ++loop) {
-
-		const char *str;
-
-		if (loop) {
-			str = "after";
-		} else {
-			str = "before";
-		}
-
-		if ((child = node.child (str)) == 0) {
-			warning << string_compose (_("global route state command has no \"%1\" node, ignoring entire command"), str) << endmsg;
-			return -1;
-		}
-
-		nlist = child->children();
-
-		for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
-
-			RouteBooleanState rbs;
-			boost::shared_ptr<Route> route;
-			ID id;
-
-			prop = (*niter)->property ("id");
-			id = prop->value ();
-
-			if ((route = sess.route_by_id (id)) == 0) {
-				warning << string_compose (_("cannot find track/bus \"%1\" while rebuilding a global route state command, ignored"), id.to_s()) << endmsg;
-				continue;
-			}
-
-			rbs.first = boost::weak_ptr<Route> (route);
-
-			prop = (*niter)->property ("yn");
-			rbs.second = (prop->value() == "1");
-
-			if (loop) {
-				after.push_back (rbs);
-			} else {
-				before.push_back (rbs);
-			}
-		}
-	}
-
-	return 0;
-}
-
-XMLNode&
-Session::GlobalRouteStateCommand::get_state ()
-{
-	XMLNode* node = new XMLNode (X_("GlobalRouteStateCommand"));
-	XMLNode* nbefore = new XMLNode (X_("before"));
-	XMLNode* nafter = new XMLNode (X_("after"));
-
-	for (Session::GlobalRouteBooleanState::iterator x = before.begin(); x != before.end(); ++x) {
-		XMLNode* child = new XMLNode ("s");
-		boost::shared_ptr<Route> r = x->first.lock();
-
-		if (r) {
-			child->add_property (X_("id"), r->id().to_s());
-			child->add_property (X_("yn"), (x->second ? "1" : "0"));
-			nbefore->add_child_nocopy (*child);
-		}
-	}
-
-	for (Session::GlobalRouteBooleanState::iterator x = after.begin(); x != after.end(); ++x) {
-		XMLNode* child = new XMLNode ("s");
-		boost::shared_ptr<Route> r = x->first.lock();
-
-		if (r) {
-			child->add_property (X_("id"), r->id().to_s());
-			child->add_property (X_("yn"), (x->second ? "1" : "0"));
-			nafter->add_child_nocopy (*child);
-		}
-	}
-
-	node->add_child_nocopy (*nbefore);
-	node->add_child_nocopy (*nafter);
-
-	return *node;
-}
-
-// solo
-
-Session::GlobalSoloStateCommand::GlobalSoloStateCommand(Session &sess, void *src)
-	: GlobalRouteStateCommand (sess, src)
-{
-    after = before = sess.get_global_route_boolean(&Route::soloed);
-}
-
-Session::GlobalSoloStateCommand::GlobalSoloStateCommand (Session& sess, const XMLNode& node)
-	: Session::GlobalRouteStateCommand (sess, node)
-{
-}
-
-void
-Session::GlobalSoloStateCommand::mark()
-{
-    after = sess.get_global_route_boolean(&Route::soloed);
-}
-
-void
-Session::GlobalSoloStateCommand::operator()()
-{
-    sess.set_global_solo(after, src);
-}
-
-void
-Session::GlobalSoloStateCommand::undo()
-{
-    sess.set_global_solo(before, src);
-}
-
-XMLNode&
-Session::GlobalSoloStateCommand::get_state()
-{
-	XMLNode& node = GlobalRouteStateCommand::get_state();
-	node.add_property ("type", "solo");
-	return node;
-}
-
-// mute
-Session::GlobalMuteStateCommand::GlobalMuteStateCommand(Session &sess, void *src)
-	: GlobalRouteStateCommand (sess, src)
-{
-    after = before = sess.get_global_route_boolean(&Route::muted);
-}
-
-Session::GlobalMuteStateCommand::GlobalMuteStateCommand (Session& sess, const XMLNode& node)
-	: Session::GlobalRouteStateCommand (sess, node)
-{
-}
-
-void
-Session::GlobalMuteStateCommand::mark()
-{
-	after = sess.get_global_route_boolean(&Route::muted);
-}
-
-void
-Session::GlobalMuteStateCommand::operator()()
-{
-	sess.set_global_mute(after, src);
-}
-
-void
-Session::GlobalMuteStateCommand::undo()
-{
-	sess.set_global_mute(before, src);
-}
-
-XMLNode&
-Session::GlobalMuteStateCommand::get_state()
-{
-	XMLNode& node = GlobalRouteStateCommand::get_state();
-	node.add_property ("type", "mute");
-	return node;
-}
-
-// record enable
-Session::GlobalRecordEnableStateCommand::GlobalRecordEnableStateCommand(Session &sess, void *src)
-	: GlobalRouteStateCommand (sess, src)
-{
-	after = before = sess.get_global_route_boolean(&Route::record_enabled);
-}
-
-Session::GlobalRecordEnableStateCommand::GlobalRecordEnableStateCommand (Session& sess, const XMLNode& node)
-	: Session::GlobalRouteStateCommand (sess, node)
-{
-}
-
-void
-Session::GlobalRecordEnableStateCommand::mark()
-{
-	after = sess.get_global_route_boolean(&Route::record_enabled);
-}
-
-void
-Session::GlobalRecordEnableStateCommand::operator()()
-{
-	sess.set_global_record_enable(after, src);
-}
-
-void
-Session::GlobalRecordEnableStateCommand::undo()
-{
-	sess.set_global_record_enable(before, src);
-}
-
-XMLNode&
-Session::GlobalRecordEnableStateCommand::get_state()
-{
-	XMLNode& node = GlobalRouteStateCommand::get_state();
-	node.add_property ("type", "rec-enable");
-	return node;
-}
-
-// metering
-Session::GlobalMeteringStateCommand::GlobalMeteringStateCommand(Session &s, void *p)
-	: sess (s), src (p)
-{
-	after = before = sess.get_global_route_metering();
-}
-
-Session::GlobalMeteringStateCommand::GlobalMeteringStateCommand (Session& s, const XMLNode& node)
-	: sess (s), src (this)
-{
-	if (set_state (node, Stateful::loading_state_version)) {
-		throw failed_constructor();
-	}
-}
-
-void
-Session::GlobalMeteringStateCommand::mark()
-{
-	after = sess.get_global_route_metering();
-}
-
-void
-Session::GlobalMeteringStateCommand::operator()()
-{
-	sess.set_global_route_metering(after, src);
-}
-
-void
-Session::GlobalMeteringStateCommand::undo()
-{
-	sess.set_global_route_metering(before, src);
-}
-
-XMLNode&
-Session::GlobalMeteringStateCommand::get_state()
-{
-	XMLNode* node = new XMLNode (X_("GlobalRouteStateCommand"));
-	XMLNode* nbefore = new XMLNode (X_("before"));
-	XMLNode* nafter = new XMLNode (X_("after"));
-
-	for (Session::GlobalRouteMeterState::iterator x = before.begin(); x != before.end(); ++x) {
-		XMLNode* child = new XMLNode ("s");
-		boost::shared_ptr<Route> r = x->first.lock();
-
-		if (r) {
-			child->add_property (X_("id"), r->id().to_s());
-
-			const char* meterstr = 0;
-
-			switch (x->second) {
-			case MeterInput:
-				meterstr = X_("input");
-				break;
-			case MeterPreFader:
-				meterstr = X_("pre");
-				break;
-			case MeterPostFader:
-				meterstr = X_("post");
-				break;
-			default:
-				fatal << string_compose (_("programming error: %1") , "no meter state in Session::GlobalMeteringStateCommand::get_state") << endmsg;
-			}
-
-			child->add_property (X_("meter"), meterstr);
-			nbefore->add_child_nocopy (*child);
-		}
-	}
-
-	for (Session::GlobalRouteMeterState::iterator x = after.begin(); x != after.end(); ++x) {
-		XMLNode* child = new XMLNode ("s");
-		boost::shared_ptr<Route> r = x->first.lock();
-
-		if (r) {
-			child->add_property (X_("id"), r->id().to_s());
-
-			const char* meterstr;
-
-			switch (x->second) {
-			case MeterInput:
-				meterstr = X_("input");
-				break;
-			case MeterPreFader:
-				meterstr = X_("pre");
-				break;
-			case MeterPostFader:
-				meterstr = X_("post");
-				break;
-			default: meterstr = "";
-			}
-
-			child->add_property (X_("meter"), meterstr);
-			nafter->add_child_nocopy (*child);
-		}
-	}
-
-	node->add_child_nocopy (*nbefore);
-	node->add_child_nocopy (*nafter);
-
-	node->add_property ("type", "metering");
-
-	return *node;
-}
-
-int
-Session::GlobalMeteringStateCommand::set_state (const XMLNode& node, int /*version*/)
-{
-	GlobalRouteBooleanState states;
-	XMLNodeList nlist;
-	const XMLProperty* prop;
-	XMLNode* child;
-	XMLNodeConstIterator niter;
-	int loop;
-
-	before.clear ();
-	after.clear ();
-
-	for (loop = 0; loop < 2; ++loop) {
-
-		const char *str;
-
-		if (loop) {
-			str = "after";
-		} else {
-			str = "before";
-		}
-
-		if ((child = node.child (str)) == 0) {
-			warning << string_compose (_("global route meter state command has no \"%1\" node, ignoring entire command"), str) << endmsg;
-			return -1;
-		}
-
-		nlist = child->children();
-
-		for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
-
-			RouteMeterState rms;
-			boost::shared_ptr<Route> route;
-			ID id;
-
-			prop = (*niter)->property ("id");
-			id = prop->value ();
-
-			if ((route = sess.route_by_id (id)) == 0) {
-				warning << string_compose (_("cannot find track/bus \"%1\" while rebuilding a global route state command, ignored"), id.to_s()) << endmsg;
-				continue;
-			}
-
-			rms.first = boost::weak_ptr<Route> (route);
-
-			prop = (*niter)->property ("meter");
-
-			if (prop->value() == X_("pre")) {
-				rms.second = MeterPreFader;
-			} else if (prop->value() == X_("post")) {
-				rms.second = MeterPostFader;
-			} else {
-				rms.second = MeterInput;
-			}
-
-			if (loop) {
-				after.push_back (rms);
-			} else {
-				before.push_back (rms);
-			}
-		}
-	}
-
-	return 0;
-}