Move a forward declaration (for class ArdourVSpacer) so that MSVC can also use it

[ardour.git] / libs / surfaces / mackie / controls.h

diff --git a/libs/surfaces/mackie/controls.h b/libs/surfaces/mackie/controls.h
index 0923c9772fb973775b829c486c460d57be96e97f..c53be76891df4d3d7fb18cf7e5949ed927cae89a 100644 (file)
--- a/libs/surfaces/mackie/controls.h
+++ b/libs/surfaces/mackie/controls.h
@@ -27,6 +27,7 @@
 
 #include <boost/smart_ptr.hpp>
 
+#include "pbd/controllable.h"
 #include "pbd/signals.h"
 
 #include "mackie_control_exception.h"
@@ -36,27 +37,27 @@ namespace ARDOUR {
        class AutomationControl;
 }
 
-namespace Mackie
-{
+namespace ArdourSurface {
+
+namespace Mackie {
 
 class Strip;
 class Group;
 class Surface;
 
-class Control
-{
+class Control {
 public:
        Control (int id, std::string name, Group& group);
        virtual ~Control() {}
-       
+
        int id() const { return _id; }
        const std::string & name() const  { return _name; }
        Group & group() const { return _group; }
 
        bool in_use () const;
        void set_in_use (bool);
-       
-       /// Keep track of the timeout so it can be updated with more incoming events
+
+       // Keep track of the timeout so it can be updated with more incoming events
        sigc::connection in_use_connection;
 
        virtual MidiByteArray zero() = 0;
@@ -70,8 +71,8 @@ public:
        virtual void set_control (boost::shared_ptr<ARDOUR::AutomationControl>);
 
        float get_value ();
-       void set_value (float val);
-       
+       void set_value (float val, PBD::Controllable::GroupControlDisposition gcd = PBD::Controllable::UseGroup);
+
        virtual void start_touch (double when);
        virtual void stop_touch (bool mark, double when);
 
@@ -85,8 +86,9 @@ public:
        bool _in_use;
 };
 
-std::ostream & operator <<  (std::ostream & os, const Control & control);
-
 }
+}
+
+std::ostream & operator <<  (std::ostream & os, const ArdourSurface::Mackie::Control & control);
 
 #endif /* __mackie_controls_h__ */