From c175baf9dd0dabbd2f4158a6e5a95486fe2f0fe0 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 21 Nov 2012 23:16:02 +0000 Subject: [PATCH] from the depths of thorwil's dumpster diving comes a fix incorrect solo behaviour in 2.X sessions loaded into 3.0 because master/monitor/auditioner routes are not told to ignore solo state; remove unnecessary error message git-svn-id: svn://localhost/ardour2/branches/3.0@13543 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/route.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc index 1d1b75239b..749552b0d2 100644 --- a/libs/ardour/route.cc +++ b/libs/ardour/route.cc @@ -223,7 +223,6 @@ Route::set_remote_control_id_internal (uint32_t id, bool notify_class_listeners) } if (id < 1) { - error << _("Remote Control ID's start at one, not zero") << endmsg; return; } @@ -2223,6 +2222,10 @@ Route::set_state_2X (const XMLNode& node, int version) _flags = Flag (0); } + if (is_master() || is_monitor() || is_hidden()) { + _mute_master->set_solo_ignore (true); + } + if ((prop = node.property (X_("phase-invert"))) != 0) { boost::dynamic_bitset<> p (_input->n_ports().n_audio ()); if (string_is_affirmative (prop->value ())) {