solo models work again (amazing how hard this was); remove crufty debug output; remove scrollbars on editor (and temporarily lose zoom controls)

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

4 files changed, 13 insertions, 10 deletions

diff --git a/libs/ardour/ardour/delivery.h b/libs/ardour/ardour/delivery.h
index 32ecc98215..7f1d964264 100644
--- a/libs/ardour/ardour/delivery.h
+++ b/libs/ardour/ardour/delivery.h
@@ -64,12 +64,8 @@ public:
 
 	void no_outs_cuz_we_no_monitor(bool);
 
-	void mod_solo_level (int32_t);
-	uint32_t solo_level() const { return _solo_level; }
-	bool soloed () const { return (bool) _solo_level; }
-
-	bool solo_isolated() const { return _solo_isolated; }
-	void set_solo_isolated (bool);
+	void set_solo_level (int32_t sl) { _solo_level = sl; }
+	void set_solo_isolated (bool yn) { _solo_isolated = yn; }
 
 	void cycle_start (nframes_t);
 	void increment_output_offset (nframes_t);
diff --git a/libs/ardour/ardour/rc_configuration_vars.h b/libs/ardour/ardour/rc_configuration_vars.h
index 3f063f4692..b156513a2d 100644
--- a/libs/ardour/ardour/rc_configuration_vars.h
+++ b/libs/ardour/ardour/rc_configuration_vars.h
@@ -77,7 +77,7 @@ CONFIG_VARIABLE (bool, mute_affects_post_fader, "mute-affects-post-fader", true)
 CONFIG_VARIABLE (bool, mute_affects_control_outs, "mute-affects-control-outs", true)
 CONFIG_VARIABLE (bool, mute_affects_main_outs, "mute-affects-main-outs", true)
 CONFIG_VARIABLE (MonitorModel, monitoring_model, "monitoring-model", ExternalMonitoring)
-CONFIG_VARIABLE (SoloModel, solo_model, "solo-model", InverseMute)
+CONFIG_VARIABLE (SoloModel, solo_model, "solo-model", SoloInPlace)
 CONFIG_VARIABLE (bool, solo_latched, "solo-latched", true)
 CONFIG_VARIABLE (bool, latched_record_enable, "latched-record-enable", false)
 CONFIG_VARIABLE (bool, all_safe, "all-safe", false)
diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h
index 339f18ef3f..122927ff7d 100644
--- a/libs/ardour/ardour/route.h
+++ b/libs/ardour/ardour/route.h
@@ -124,8 +124,11 @@ class Route : public SessionObject, public AutomatableControls
 	void set_mute (bool yn, void* src);
 	bool muted () const;
 
+	/* controls use set_solo() to modify this route's solo state
+	 */
+
 	void set_solo (bool yn, void *src);
-	bool soloed() const;
+	bool soloed () const { return (bool) _solo_level; }
 
 	void set_solo_isolated (bool yn, void *src);
 	bool solo_isolated() const;
@@ -315,6 +318,7 @@ class Route : public SessionObject, public AutomatableControls
 
 	void catch_up_on_solo_mute_override ();
 	void mod_solo_level (int32_t);
+	uint32_t solo_level () const { return _solo_level; }
 	void set_block_size (nframes_t nframes);
 	bool has_external_redirects() const;
 	void curve_reallocate ();
@@ -340,13 +344,16 @@ class Route : public SessionObject, public AutomatableControls
 	ProcessorList  _processors;
 	mutable Glib::RWLock   _processor_lock;
 	boost::shared_ptr<Delivery> _main_outs;
-	boost::shared_ptr<Delivery> _control_outs; // XXX to be removed/generalized by listen points
+	boost::shared_ptr<Delivery> _control_outs;
 	boost::shared_ptr<InternalReturn> _intreturn;
 
 	Flag           _flags;
 	int            _pending_declick;
 	MeterPoint     _meter_point;
 	uint32_t       _phase_invert;
+	uint32_t       _solo_level;
+	bool           _solo_isolated;
+
 	bool           _denormal_protection;
 	
 	bool _recordable : 1;
diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h
index b5e53d494e..874a3f7ca0 100644
--- a/libs/ardour/ardour/types.h
+++ b/libs/ardour/ardour/types.h
@@ -331,7 +331,7 @@ namespace ARDOUR {
 	};
 
 	enum SoloModel {
-		InverseMute,
+		SoloInPlace,
 		SoloBus
 	};