From cd59f876f739ba6f0f8aaf3d584cb255bfeed273 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 13 Jan 2021 10:11:58 -0700 Subject: [PATCH] solo isolate control starts with its route's time domain --- libs/ardour/ardour/solo_isolate_control.h | 2 +- libs/ardour/route.cc | 2 +- libs/ardour/solo_isolate_control.cc | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/ardour/ardour/solo_isolate_control.h b/libs/ardour/ardour/solo_isolate_control.h index 54be3e4a6f..8857459be8 100644 --- a/libs/ardour/ardour/solo_isolate_control.h +++ b/libs/ardour/ardour/solo_isolate_control.h @@ -37,7 +37,7 @@ class Muteable; class LIBARDOUR_API SoloIsolateControl : public SlavableAutomationControl { public: - SoloIsolateControl (Session& session, std::string const & name, Soloable& soloable); + SoloIsolateControl (Session& session, std::string const & name, Soloable& soloable, Temporal::TimeDomain); double get_value () const; diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc index f7a9ecc02c..da23eb1dcb 100644 --- a/libs/ardour/route.cc +++ b/libs/ardour/route.cc @@ -175,7 +175,7 @@ Route::init () _phase_control.reset (new PhaseControl (_session, X_("phase"))); add_control (_phase_control); - _solo_isolate_control.reset (new SoloIsolateControl (_session, X_("solo-iso"), *this)); + _solo_isolate_control.reset (new SoloIsolateControl (_session, X_("solo-iso"), *this, time_domain())); add_control (_solo_isolate_control); _solo_safe_control.reset (new SoloSafeControl (_session, X_("solo-safe"), time_domain())); diff --git a/libs/ardour/solo_isolate_control.cc b/libs/ardour/solo_isolate_control.cc index c154c94aa4..4d021fd68a 100644 --- a/libs/ardour/solo_isolate_control.cc +++ b/libs/ardour/solo_isolate_control.cc @@ -28,9 +28,9 @@ using namespace ARDOUR; using namespace std; using namespace PBD; -SoloIsolateControl::SoloIsolateControl (Session& session, std::string const & name, Soloable& s, Muteable& m) +SoloIsolateControl::SoloIsolateControl (Session& session, std::string const & name, Soloable& s, Temporal::TimeDomain td) : SlavableAutomationControl (session, SoloIsolateAutomation, ParameterDescriptor (SoloIsolateAutomation), - boost::shared_ptr(new AutomationList(Evoral::Parameter(SoloIsolateAutomation), Temporal::AudioTime)), + boost::shared_ptr(new AutomationList(Evoral::Parameter(SoloIsolateAutomation), td)), name) , _soloable (s) , _solo_isolated (false)