From 66ceb2b3c714fc91771315a528c7b98db1222810 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Fri, 6 Sep 2019 20:43:20 +0200 Subject: [PATCH] NO-OP: whitespace --- .../control_protocol/control_protocol.h | 120 +++++++++--------- 1 file changed, 61 insertions(+), 59 deletions(-) diff --git a/libs/surfaces/control_protocol/control_protocol/control_protocol.h b/libs/surfaces/control_protocol/control_protocol/control_protocol.h index fbf2852331..04f41517ad 100644 --- a/libs/surfaces/control_protocol/control_protocol/control_protocol.h +++ b/libs/surfaces/control_protocol/control_protocol/control_protocol.h @@ -22,18 +22,18 @@ #ifndef ardour_control_protocols_h #define ardour_control_protocols_h +#include #include #include -#include #include -#include "pbd/stateful.h" #include "pbd/signals.h" +#include "pbd/stateful.h" -#include "control_protocol/visibility.h" #include "control_protocol/basic_ui.h" #include "control_protocol/types.h" +#include "control_protocol/visibility.h" namespace ARDOUR { @@ -44,14 +44,14 @@ class Stripable; class LIBCONTROLCP_API ControlProtocol : public PBD::Stateful, public PBD::ScopedConnectionList, public BasicUI { - public: +public: ControlProtocol (Session&, std::string name); - virtual ~ControlProtocol(); + virtual ~ControlProtocol (); - virtual std::string name() const { return _name; } + virtual std::string name () const { return _name; } virtual int set_active (bool yn); - virtual bool active() const { return _active; } + virtual bool active () const { return _active; } virtual int set_feedback (bool /*yn*/) { return 0; } virtual bool get_feedback () const { return false; } @@ -63,8 +63,8 @@ class LIBCONTROLCP_API ControlProtocol : public PBD::Stateful, public PBD::Scope PBD::Signal0 ActiveChanged; /* signals that a control protocol can emit and other (presumably graphical) - user interfaces can respond to - */ + * user interfaces can respond to + */ static PBD::Signal0 ZoomToSession; static PBD::Signal0 ZoomIn; @@ -72,8 +72,8 @@ class LIBCONTROLCP_API ControlProtocol : public PBD::Stateful, public PBD::Scope static PBD::Signal0 Enter; static PBD::Signal0 Undo; static PBD::Signal0 Redo; - static PBD::Signal1 ScrollTimeline; - static PBD::Signal1 GotoView; + static PBD::Signal1 ScrollTimeline; + static PBD::Signal1 GotoView; static PBD::Signal0 CloseDialog; static PBD::Signal0 VerticalZoomInAll; static PBD::Signal0 VerticalZoomOutAll; @@ -82,11 +82,11 @@ class LIBCONTROLCP_API ControlProtocol : public PBD::Stateful, public PBD::Scope static PBD::Signal0 StepTracksDown; static PBD::Signal0 StepTracksUp; - static PBD::Signal1 > AddStripableToSelection; - static PBD::Signal1 > SetStripableSelection; - static PBD::Signal1 > ToggleStripableSelection; - static PBD::Signal1 > RemoveStripableFromSelection; - static PBD::Signal0 ClearStripableSelection; + static PBD::Signal1 > AddStripableToSelection; + static PBD::Signal1 > SetStripableSelection; + static PBD::Signal1 > ToggleStripableSelection; + static PBD::Signal1 > RemoveStripableFromSelection; + static PBD::Signal0 ClearStripableSelection; static boost::shared_ptr first_selected_stripable (); static void set_first_selected_stripable (boost::shared_ptr); @@ -118,7 +118,7 @@ class LIBCONTROLCP_API ControlProtocol : public PBD::Stateful, public PBD::Scope bool route_get_rec_enable (uint32_t table_index); float route_get_gain (uint32_t table_index); - void route_set_gain (uint32_t table_index, float); + void route_set_gain (uint32_t table_index, float); float route_get_effective_gain (uint32_t table_index); float route_get_peak_input_power (uint32_t table_index, uint32_t which_input); @@ -133,60 +133,62 @@ class LIBCONTROLCP_API ControlProtocol : public PBD::Stateful, public PBD::Scope virtual std::list > bundles (); - virtual bool has_editor () const { return false; } - virtual void* get_gui() const { return 0; } - virtual void tear_down_gui() { } + virtual bool has_editor () const { return false; } + virtual void* get_gui () const { return 0; } + virtual void tear_down_gui () {} - XMLNode& get_state (); - int set_state (XMLNode const &, int version); + XMLNode& get_state (); + int set_state (XMLNode const&, int version); - static const std::string state_node_name; - static StripableNotificationList const & last_selected() { return _last_selected; } - static void notify_stripable_selection_changed (StripableNotificationListPtr); + static const std::string state_node_name; - protected: - std::vector > route_table; - std::string _name; + static StripableNotificationList const& last_selected () { return _last_selected; } + static void notify_stripable_selection_changed (StripableNotificationListPtr); +protected: void next_track (uint32_t initial_id); void prev_track (uint32_t initial_id); - private: - LIBCONTROLCP_LOCAL ControlProtocol (const ControlProtocol&); /* noncopyable */ - bool _active; + std::vector > route_table; + std::string _name; - static Glib::Threads::Mutex special_stripable_mutex; - static boost::weak_ptr _leftmost_mixer_stripable; - static boost::weak_ptr _first_selected_stripable; - static StripableNotificationList _last_selected; - static PBD::ScopedConnection selection_connection; - static bool selection_connected; +private: + LIBCONTROLCP_LOCAL ControlProtocol (const ControlProtocol&); /* noncopyable */ + + bool _active; + + static Glib::Threads::Mutex special_stripable_mutex; + static boost::weak_ptr _leftmost_mixer_stripable; + static boost::weak_ptr _first_selected_stripable; + static StripableNotificationList _last_selected; + static PBD::ScopedConnection selection_connection; + static bool selection_connected; }; extern "C" { - class ControlProtocolDescriptor { - public: - const char* name; /* descriptive */ - const char* id; /* unique and version-specific */ - void* ptr; /* protocol can store a value here */ - void* module; /* not for public access */ - int mandatory; /* if non-zero, always load and do not make optional */ - bool supports_feedback; /* if true, protocol has toggleable feedback mechanism */ - bool (*probe)(ControlProtocolDescriptor*); - ControlProtocol* (*initialize)(ControlProtocolDescriptor*,Session*); - void (*destroy)(ControlProtocolDescriptor*,ControlProtocol*); - /* this is required if the control protocol connects to signals - from libardour. they all do. It should allocate a - type-specific request buffer for the calling thread, and - store it in a thread-local location that will be used to - find it when sending the event loop a message - (e.g. call_slot()). It should also return the allocated - buffer as a void*. - */ - void* (*request_buffer_factory)(uint32_t); - }; +class ControlProtocolDescriptor +{ +public: + const char* name; /* descriptive */ + const char* id; /* unique and version-specific */ + void* ptr; /* protocol can store a value here */ + void* module; /* not for public access */ + int mandatory; /* if non-zero, always load and do not make optional */ + bool supports_feedback; /* if true, protocol has toggleable feedback mechanism */ + bool (*probe) (ControlProtocolDescriptor*); + ControlProtocol* (*initialize) (ControlProtocolDescriptor*, Session*); + void (*destroy) (ControlProtocolDescriptor*, ControlProtocol*); + /* this is required if the control protocol connects to signals + * from libardour. they all do. It should allocate a + * type-specific request buffer for the calling thread, and + * store it in a thread-local location that will be used to + * find it when sending the event loop a message + * (e.g. call_slot()). It should also return the allocated + * buffer as a void*. + */ + void* (*request_buffer_factory) (uint32_t); +}; } - } #endif // ardour_control_protocols_h