fix ambiguity in VCA constructors

diff --git a/libs/ardour/ardour/vca.h b/libs/ardour/ardour/vca.h
index 526cfa01103db489a8303f8657a458a5be125e5c..15850242cc3cac14d8b6d60820a407b88309f091 100644 (file)
--- 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 6b3504ea0fa55f064288c256d888d896effaab1e..6a696b5a55e734a24a95ca6b65a45bca58bba76e 100644 (file)
--- 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 420396bf0732609a803f4a81e605f67306b48ea5..c8e3a009e4eed27f02a64674c1d5ded0c24577ad 100644 (file)
--- 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> vca = boost::shared_ptr<VCA> (new VCA (_session, name, num));
+                       boost::shared_ptr<VCA> vca = boost::shared_ptr<VCA> (new VCA (_session, num, name));
 
                        _vcas.push_back (vca);
                        vcal.push_back (vca);