add rec-enable and monitor controls to VCAs

diff --git a/libs/ardour/ardour/vca.h b/libs/ardour/ardour/vca.h
index a3dfb3ec076f091dfdef7eba4a48396370723bd4..926cd500e03df94fb7044626e6fcbb7a821c9f15 100644 (file)
--- a/libs/ardour/ardour/vca.h
+++ b/libs/ardour/ardour/vca.h
@@ -28,6 +28,8 @@
 
 #include "ardour/automatable.h"
 #include "ardour/muteable.h"
+#include "ardour/monitorable.h"
+#include "ardour/recordable.h"
 #include "ardour/soloable.h"
 #include "ardour/slavable.h"
 #include "ardour/stripable.h"
@@ -40,7 +42,14 @@ class SoloControl;
 class MuteControl;
 class MonitorControl;
 
-class LIBARDOUR_API VCA : public Stripable, public Soloable, public Muteable, public Automatable, public Slavable, public boost::enable_shared_from_this<VCA> {
+class LIBARDOUR_API VCA : public Stripable,
+                          public Soloable,
+                          public Muteable,
+                          public Automatable,
+                          public Slavable,
+                          public Recordable,
+                          public Monitorable,
+                          public boost::enable_shared_from_this<VCA> {
   public:
        VCA (Session& session,  uint32_t num, const std::string& name);
        ~VCA();
@@ -52,6 +61,8 @@ class LIBARDOUR_API VCA : public Stripable, public Soloable, public Muteable, pu
        XMLNode& get_state();
        int set_state (XMLNode const&, int version);
 
+       /* Soloable API */
+
        void clear_all_solo_state ();
 
        bool soloed () const;
@@ -60,9 +71,21 @@ class LIBARDOUR_API VCA : public Stripable, public Soloable, public Muteable, pu
        bool can_solo() const { return true; }
        bool is_safe () const { return false; }
 
+       /* Muteable API */
+
        bool can_be_muted_by_others () const { return true; }
        bool muted_by_others_soloing() const { return false; }
 
+       /* Recordable API */
+
+       int prep_record_enabled (bool yn) { return 0; }
+       bool can_be_record_enabled() { return true; }
+       bool can_be_record_safe() { return true; }
+
+       /* Monitorable API */
+
+       MonitorState monitoring_state() const;
+
        static std::string default_name_template ();
        static int next_vca_number ();
        static std::string xml_node_name;
@@ -74,6 +97,8 @@ class LIBARDOUR_API VCA : public Stripable, public Soloable, public Muteable, pu
        virtual boost::shared_ptr<GainControl> gain_control() const { return _gain_control; }
        virtual boost::shared_ptr<SoloControl> solo_control() const { return _solo_control; }
        virtual boost::shared_ptr<MuteControl> mute_control() const { return _mute_control; }
+       virtual boost::shared_ptr<AutomationControl> recenable_control() const { return _recenable_control; }
+       virtual boost::shared_ptr<MonitorControl>    monitoring_control() const { return _monitor_control; }
 
        /* null Stripable API, because VCAs don't have any of this */
 
@@ -81,8 +106,6 @@ class LIBARDOUR_API VCA : public Stripable, public Soloable, public Muteable, pu
        virtual boost::shared_ptr<const PeakMeter>   peak_meter() const { return boost::shared_ptr<PeakMeter>(); }
        virtual boost::shared_ptr<PhaseControl>      phase_control() const { return boost::shared_ptr<PhaseControl>(); }
        virtual boost::shared_ptr<GainControl>       trim_control() const { return boost::shared_ptr<GainControl>(); }
-       virtual boost::shared_ptr<MonitorControl>    monitoring_control() const { return boost::shared_ptr<MonitorControl>(); }
-       virtual boost::shared_ptr<AutomationControl> recenable_control() const { return boost::shared_ptr<AutomationControl>(); }
        virtual boost::shared_ptr<AutomationControl> pan_azimuth_control() const { return boost::shared_ptr<AutomationControl>(); }
        virtual boost::shared_ptr<AutomationControl> pan_elevation_control() const { return boost::shared_ptr<AutomationControl>(); }
        virtual boost::shared_ptr<AutomationControl> pan_width_control() const { return boost::shared_ptr<AutomationControl>(); }
@@ -119,6 +142,9 @@ class LIBARDOUR_API VCA : public Stripable, public Soloable, public Muteable, pu
        boost::shared_ptr<GainControl> _gain_control;
        boost::shared_ptr<SoloControl> _solo_control;
        boost::shared_ptr<MuteControl> _mute_control;
+       boost::shared_ptr<AutomationControl> _recenable_control;
+       // boost::shared_ptr<AutomationControl> _record_safe_control;
+       boost::shared_ptr<MonitorControl> _monitor_control;
 
        static gint next_number;
 

diff --git a/libs/ardour/vca.cc b/libs/ardour/vca.cc
index 72c0a2cdcb71719e949ed019ca5af0bc6f15e193..d1e93cc40350c5be84975721eb6a3c5936ef252d 100644 (file)
--- a/libs/ardour/vca.cc
+++ b/libs/ardour/vca.cc
@@ -20,7 +20,9 @@
 
 #include "ardour/automation_control.h"
 #include "ardour/gain_control.h"
+#include "ardour/monitor_control.h"
 #include "ardour/rc_configuration.h"
+#include "ardour/record_enable_control.h"
 #include "ardour/route.h"
 #include "ardour/session.h"
 #include "ardour/vca.h"
@@ -75,6 +77,8 @@ VCA::init ()
 {
        _solo_control.reset (new SoloControl (_session, X_("solo"), *this, *this));
        _mute_control.reset (new MuteControl (_session, X_("mute"), *this));
+       _recenable_control.reset (new RecordEnableControl (_session, X_("recenable"), *this));
+       _monitor_control.reset (new MonitorControl (_session, X_("monitoring"), *this));
 
        add_control (_gain_control);
        add_control (_solo_control);
@@ -183,3 +187,10 @@ VCA::unassign_controls (boost::shared_ptr<VCA> vca)
 
        return 0;
 }
+
+MonitorState
+VCA::monitoring_state () const
+{
+       /* XXX this has to get more complex but not clear how */
+       return MonitoringInput;
+}