ardour/livetrax
13
0
Fork 0
Code

Fix Windows build (post 356374b)

Browse Source 
Multiple definition of `ARDOUR::MPControl<bool>::set_value`
This commit is contained in:
Robin Gareus 2024-01-18 18:48:16 +01:00
parent 356374bfb3
commit 8ca4c4a255
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/ardour/ardour/monitor_processor.h
View File

@ -119,6 +119,8 @@ protected:
T _normal; T _normal;
}; };
template<> void MPControl<bool>::set_value (double v, PBD::Controllable::GroupControlDisposition gcd);
class LIBARDOUR_API MonitorProcessor : public Processor class LIBARDOUR_API MonitorProcessor : public Processor
{ {
public: public:

13
libs/ardour/ardour/surround_return.h
View File

@ -102,17 +102,8 @@ private:
class OutputFormatControl : public MPControl<bool> class OutputFormatControl : public MPControl<bool>
{ {
public: public:
OutputFormatControl (bool v, std::string const& n, PBD::Controllable::Flag f) OutputFormatControl (bool v, std::string const& n, PBD::Controllable::Flag f);
: MPControl<bool> (v, n, f) virtual std::string get_user_string () const;
{}
virtual std::string get_user_string () const {
if (get_value () == 0) {
return "7.1.4";
} else {
return "5.1";
}
}
}; };
std::shared_ptr<OutputFormatControl> _output_format_control; std::shared_ptr<OutputFormatControl> _output_format_control;

13
libs/ardour/surround_return.cc
View File

@ -30,6 +30,19 @@
using namespace ARDOUR; using namespace ARDOUR;
SurroundReturn::OutputFormatControl::OutputFormatControl (bool v, std::string const& n, PBD::Controllable::Flag f)
: MPControl<bool> (v, n, f)
{}
std::string
SurroundReturn::OutputFormatControl::get_user_string () const {
if (get_value () == 0) {
return "7.1.4";
} else {
return "5.1";
}
}
SurroundReturn::SurroundReturn (Session& s, Route* r) SurroundReturn::SurroundReturn (Session& s, Route* r)
: Processor (s, _("SurrReturn"), Temporal::TimeDomainProvider (Temporal::AudioTime)) : Processor (s, _("SurrReturn"), Temporal::TimeDomainProvider (Temporal::AudioTime))
, _lufs_meter (s.nominal_sample_rate (), 5) , _lufs_meter (s.nominal_sample_rate (), 5)