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.cc | |
| parent | 6bcdf4f0f106d0b83ed7f221f546c132585e19e7 (diff) | |
| parent | 91b027a4a0c0e90398b9c6dbb5611b2acc4f2f8e (diff) | |
Merge branch 'master' into audioengine
Diffstat (limited to 'libs/surfaces/mackie/mackie_control_protocol.cc')
| -rw-r--r-- | libs/surfaces/mackie/mackie_control_protocol.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc index ffda2435d0..635ce2b34a 100644 --- a/libs/surfaces/mackie/mackie_control_protocol.cc +++ b/libs/surfaces/mackie/mackie_control_protocol.cc @@ -101,7 +101,7 @@ MackieControlProtocol::MackieControlProtocol (Session& session) , _gui (0) , _zoom_mode (false) , _scrub_mode (false) - , _flip_mode (false) + , _flip_mode (Normal) , _view_mode (Mixer) , _current_selected_track (-1) , _modifier_state (0) @@ -1271,11 +1271,11 @@ MackieControlProtocol::set_view_mode (ViewMode m) } void -MackieControlProtocol::set_flip_mode (bool yn) +MackieControlProtocol::set_flip_mode (FlipMode fm) { Glib::Threads::Mutex::Lock lm (surfaces_lock); - _flip_mode = yn; + _flip_mode = fm; for (Surfaces::iterator s = surfaces.begin(); s != surfaces.end(); ++s) { (*s)->update_flip_mode_display (); |