diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2013-09-03 17:41:49 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-09-03 17:41:49 -0400 |
commit | d074bc586e494d7dd83d415a487195a477095a4f (patch) | |
tree | 8748ae1d85ef796449dcd30cff6ba6f2196a4704 /libs/surfaces/mackie/mackie_control_protocol.h | |
parent | 6bcdf4f0f106d0b83ed7f221f546c132585e19e7 (diff) | |
parent | 91b027a4a0c0e90398b9c6dbb5611b2acc4f2f8e (diff) |
Merge branch 'master' into audioengine
Diffstat (limited to 'libs/surfaces/mackie/mackie_control_protocol.h')
-rw-r--r-- | libs/surfaces/mackie/mackie_control_protocol.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/surfaces/mackie/mackie_control_protocol.h b/libs/surfaces/mackie/mackie_control_protocol.h index 710745f157..ffc06a32eb 100644 --- a/libs/surfaces/mackie/mackie_control_protocol.h +++ b/libs/surfaces/mackie/mackie_control_protocol.h @@ -123,13 +123,13 @@ class MackieControlProtocol void set_device (const std::string&, bool allow_activation = true); void set_profile (const std::string&); - bool flip_mode () const { return _flip_mode; } + FlipMode flip_mode () const { return _flip_mode; } ViewMode view_mode () const { return _view_mode; } bool zoom_mode () const { return _zoom_mode; } bool metering_active () const { return _metering_active; } void set_view_mode (ViewMode); - void set_flip_mode (bool); + void set_flip_mode (FlipMode); XMLNode& get_state (); int set_state (const XMLNode&, int version); @@ -278,7 +278,7 @@ class MackieControlProtocol void* _gui; bool _zoom_mode; bool _scrub_mode; - bool _flip_mode; + FlipMode _flip_mode; ViewMode _view_mode; int _current_selected_track; int _modifier_state; |