diff --git a/libs/ardour/ardour/amp.h b/libs/ardour/ardour/amp.h index e8e353bdfa..e276336436 100644 --- a/libs/ardour/ardour/amp.h +++ b/libs/ardour/ardour/amp.h @@ -72,7 +72,6 @@ public: } private: - bool _denormal_protection; bool _apply_gain_automation; float _current_gain; samplepos_t _current_automation_sample; diff --git a/libs/ardour/ardour/export_channel.h b/libs/ardour/ardour/export_channel.h index aa504eb8da..14b6533803 100644 --- a/libs/ardour/ardour/export_channel.h +++ b/libs/ardour/ardour/export_channel.h @@ -119,7 +119,6 @@ class LIBARDOUR_API RegionExportChannelFactory void update_buffers (samplecnt_t samples); AudioRegion const & region; - AudioTrack & track; Type type; samplecnt_t samples_per_cycle; diff --git a/libs/ardour/ardour/solo_isolate_control.h b/libs/ardour/ardour/solo_isolate_control.h index d869bed603..54be3e4a6f 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, Muteable& m); + SoloIsolateControl (Session& session, std::string const & name, Soloable& soloable); double get_value () const; @@ -78,7 +78,6 @@ class LIBARDOUR_API SoloIsolateControl : public SlavableAutomationControl private: Soloable& _soloable; - Muteable& _muteable; bool _solo_isolated; uint32_t _solo_isolated_by_upstream; diff --git a/libs/ardour/export_channel.cc b/libs/ardour/export_channel.cc index 6ee3978533..a6fb193324 100644 --- a/libs/ardour/export_channel.cc +++ b/libs/ardour/export_channel.cc @@ -169,9 +169,8 @@ PortExportChannel::set_state (XMLNode * node, Session & session) } } -RegionExportChannelFactory::RegionExportChannelFactory (Session * session, AudioRegion const & region, AudioTrack & track, Type type) +RegionExportChannelFactory::RegionExportChannelFactory (Session * session, AudioRegion const & region, AudioTrack&, Type type) : region (region) - , track (track) , type (type) , samples_per_cycle (session->engine().samples_per_cycle ()) , buffers_up_to_date (false) diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc index 987794287e..0ee56879ab 100644 --- a/libs/ardour/route.cc +++ b/libs/ardour/route.cc @@ -173,7 +173,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, *this)); + _solo_isolate_control.reset (new SoloIsolateControl (_session, X_("solo-iso"), *this)); add_control (_solo_isolate_control); _solo_safe_control.reset (new SoloSafeControl (_session, X_("solo-safe"))); diff --git a/libs/ardour/solo_isolate_control.cc b/libs/ardour/solo_isolate_control.cc index 34ce067fd7..16f764cd86 100644 --- a/libs/ardour/solo_isolate_control.cc +++ b/libs/ardour/solo_isolate_control.cc @@ -28,12 +28,11 @@ 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) : SlavableAutomationControl (session, SoloIsolateAutomation, ParameterDescriptor (SoloIsolateAutomation), boost::shared_ptr(new AutomationList(Evoral::Parameter(SoloIsolateAutomation))), name) , _soloable (s) - , _muteable (m) , _solo_isolated (false) , _solo_isolated_by_upstream (0) {