From dd31ef2d1b95d05e74307f075d2070b10ae94884 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 4 Mar 2016 14:56:27 -0500 Subject: [PATCH] fix ambiguity in VCA constructors --- libs/ardour/ardour/vca.h | 2 +- libs/ardour/vca.cc | 2 +- libs/ardour/vca_manager.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/ardour/ardour/vca.h b/libs/ardour/ardour/vca.h index 526cfa0110..15850242cc 100644 --- a/libs/ardour/ardour/vca.h +++ b/libs/ardour/ardour/vca.h @@ -35,7 +35,7 @@ class Route; class LIBARDOUR_API VCA : public SessionHandleRef, public PBD::StatefulDestructible, public Automatable { public: - VCA (Session& session, const std::string& name, uint32_t num); + VCA (Session& session, uint32_t num, const std::string& name); VCA (Session& session, XMLNode const&, int version); ~VCA(); diff --git a/libs/ardour/vca.cc b/libs/ardour/vca.cc index 6b3504ea0f..6a696b5a55 100644 --- a/libs/ardour/vca.cc +++ b/libs/ardour/vca.cc @@ -47,7 +47,7 @@ VCA::next_vca_number () return g_atomic_int_add (&next_number, 1) + 1; } -VCA::VCA (Session& s, const string& name, uint32_t num) +VCA::VCA (Session& s, uint32_t num, const string& name) : SessionHandleRef (s) , Automatable (s) , _number (num) diff --git a/libs/ardour/vca_manager.cc b/libs/ardour/vca_manager.cc index 420396bf07..c8e3a009e4 100644 --- a/libs/ardour/vca_manager.cc +++ b/libs/ardour/vca_manager.cc @@ -73,7 +73,7 @@ VCAManager::create_vca (uint32_t howmany, std::string const & name_template) replace_all (name, "%n", sn); } - boost::shared_ptr vca = boost::shared_ptr (new VCA (_session, name, num)); + boost::shared_ptr vca = boost::shared_ptr (new VCA (_session, num, name)); _vcas.push_back (vca); vcal.push_back (vca);