make solo button2 click function as momentary even when in listen mode; tweak auditioner so that we know if its using the monitor bus

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

1 files changed, 6 insertions, 3 deletions

diff --git a/libs/ardour/auditioner.cc b/libs/ardour/auditioner.cc
index f955c75ea4..d7df19a704 100644
--- a/libs/ardour/auditioner.cc
+++ b/libs/ardour/auditioner.cc
@@ -42,6 +42,10 @@ using namespace PBD;
 
 Auditioner::Auditioner (Session& s)
 	: AudioTrack (s, "auditioner", Route::Hidden)
+        , current_frame (0)
+        , _auditioning (0)
+        , length (0)
+        , via_monitor (false)
 {
 }
 
@@ -58,6 +62,7 @@ Auditioner::init ()
 	if (left == "default") {
                 if (_session.monitor_out()) {
                         left = _session.monitor_out()->input()->audio (0)->name();
+                        via_monitor = true;
                 } else {
                         left = _session.engine().get_nth_physical_output (DataType::AUDIO, 0);
                 }
@@ -66,6 +71,7 @@ Auditioner::init ()
 	if (right == "default") {
                 if (_session.monitor_out()) {
                         right = _session.monitor_out()->input()->audio (1)->name();
+                        via_monitor = true;
                 } else {
                         right = _session.engine().get_nth_physical_output (DataType::AUDIO, 1);
                 }
@@ -91,9 +97,6 @@ Auditioner::init ()
 
 	_output->changed.connect_same_thread (*this, boost::bind (&Auditioner::output_changed, this, _1, _2));
 
-	the_region.reset ((AudioRegion*) 0);
-	g_atomic_int_set (&_auditioning, 0);
-
         return 0;
 }