smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-18 20:56:28 +01:00
Code Issues Projects Releases Wiki Activity

fix ambiguity in VCA constructors

Browse source
This commit is contained in:
Paul Davis 2016-03-04 14:56:27 -05:00
parent dc9f579a8b
commit dd31ef2d1b
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libs/ardour/ardour/vca.h
View file

@ -35,7 +35,7 @@ class Route;
class LIBARDOUR_API VCA : public SessionHandleRef, public PBD::StatefulDestructible, public Automatable { class LIBARDOUR_API VCA : public SessionHandleRef, public PBD::StatefulDestructible, public Automatable {
public: 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 (Session& session, XMLNode const&, int version);
~VCA(); ~VCA();

2
libs/ardour/vca.cc
View file

@ -47,7 +47,7 @@ VCA::next_vca_number ()
return g_atomic_int_add (&next_number, 1) + 1; 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) : SessionHandleRef (s)
, Automatable (s) , Automatable (s)
, _number (num) , _number (num)

2
libs/ardour/vca_manager.cc
View file

@ -73,7 +73,7 @@ VCAManager::create_vca (uint32_t howmany, std::string const & name_template)
replace_all (name, "%n", sn); 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); _vcas.push_back (vca);
vcal.push_back (vca); vcal.push_back (vca);