diff options
Diffstat (limited to 'libs/surfaces')
| -rw-r--r-- | libs/surfaces/mackie/button.cc | 186 | ||||
| -rw-r--r-- | libs/surfaces/mackie/strip.cc | 8 | ||||
| -rw-r--r-- | libs/surfaces/mackie/surface.cc | 4 |
3 files changed, 99 insertions, 99 deletions
diff --git a/libs/surfaces/mackie/button.cc b/libs/surfaces/mackie/button.cc index dc26429a63..836e7390df 100644 --- a/libs/surfaces/mackie/button.cc +++ b/libs/surfaces/mackie/button.cc @@ -39,102 +39,102 @@ Button::factory (Surface& surface, Button::ID bid, int id, const std::string& na int Button::name_to_id (const std::string& name) { - if (!g_strcasecmp (name.c_str(), "IO")) { return IO; } - if (!g_strcasecmp (name.c_str(), "Sends")) { return Sends; } - if (!g_strcasecmp (name.c_str(), "Pan")) { return Pan; } - if (!g_strcasecmp (name.c_str(), "Plugin")) { return Plugin; } - if (!g_strcasecmp (name.c_str(), "Eq")) { return Eq; } - if (!g_strcasecmp (name.c_str(), "Dyn")) { return Dyn; } - if (!g_strcasecmp (name.c_str(), "Left")) { return Left; } - if (!g_strcasecmp (name.c_str(), "Right")) { return Right; } - if (!g_strcasecmp (name.c_str(), "ChannelLeft")) { return ChannelLeft; } - if (!g_strcasecmp (name.c_str(), "ChannelRight")) { return ChannelRight; } - if (!g_strcasecmp (name.c_str(), "Flip")) { return Flip; } - if (!g_strcasecmp (name.c_str(), "Edit")) { return Edit; } - if (!g_strcasecmp (name.c_str(), "Name/Value")) { return NameValue; } - if (!g_strcasecmp (name.c_str(), "Timecode/Beats")) { return TimecodeBeats; } - if (!g_strcasecmp (name.c_str(), "F1")) { return F1; } - if (!g_strcasecmp (name.c_str(), "F2")) { return F2; } - if (!g_strcasecmp (name.c_str(), "F3")) { return F3; } - if (!g_strcasecmp (name.c_str(), "F4")) { return F4; } - if (!g_strcasecmp (name.c_str(), "F5")) { return F5; } - if (!g_strcasecmp (name.c_str(), "F6")) { return F6; } - if (!g_strcasecmp (name.c_str(), "F7")) { return F7; } - if (!g_strcasecmp (name.c_str(), "F8")) { return F8; } - if (!g_strcasecmp (name.c_str(), "F9")) { return F9; } - if (!g_strcasecmp (name.c_str(), "F10")) { return F10; } - if (!g_strcasecmp (name.c_str(), "F11")) { return F11; } - if (!g_strcasecmp (name.c_str(), "F12")) { return F12; } - if (!g_strcasecmp (name.c_str(), "F13")) { return F13; } - if (!g_strcasecmp (name.c_str(), "F14")) { return F14; } - if (!g_strcasecmp (name.c_str(), "F15")) { return F15; } - if (!g_strcasecmp (name.c_str(), "F16")) { return F16; } - if (!g_strcasecmp (name.c_str(), "Shift")) { return Shift; } - if (!g_strcasecmp (name.c_str(), "Option")) { return Option; } - if (!g_strcasecmp (name.c_str(), "Ctrl")) { return Ctrl; } - if (!g_strcasecmp (name.c_str(), "CmdAlt")) { return CmdAlt; } - if (!g_strcasecmp (name.c_str(), "On")) { return On; } - if (!g_strcasecmp (name.c_str(), "RecReady")) { return RecReady; } - if (!g_strcasecmp (name.c_str(), "Undo")) { return Undo; } - if (!g_strcasecmp (name.c_str(), "Save")) { return Save; } - if (!g_strcasecmp (name.c_str(), "Touch")) { return Touch; } - if (!g_strcasecmp (name.c_str(), "Redo")) { return Redo; } - if (!g_strcasecmp (name.c_str(), "Marker")) { return Marker; } - if (!g_strcasecmp (name.c_str(), "Enter")) { return Enter; } - if (!g_strcasecmp (name.c_str(), "Cancel")) { return Cancel; } - if (!g_strcasecmp (name.c_str(), "Mixer")) { return Mixer; } - if (!g_strcasecmp (name.c_str(), "FrmLeft")) { return FrmLeft; } - if (!g_strcasecmp (name.c_str(), "FrmRight")) { return FrmRight; } - if (!g_strcasecmp (name.c_str(), "Loop")) { return Loop; } - if (!g_strcasecmp (name.c_str(), "PunchIn")) { return PunchIn; } - if (!g_strcasecmp (name.c_str(), "PunchOut")) { return PunchOut; } - if (!g_strcasecmp (name.c_str(), "Home")) { return Home; } - if (!g_strcasecmp (name.c_str(), "End")) { return End; } - if (!g_strcasecmp (name.c_str(), "Rewind")) { return Rewind; } - if (!g_strcasecmp (name.c_str(), "Ffwd")) { return Ffwd; } - if (!g_strcasecmp (name.c_str(), "Stop")) { return Stop; } - if (!g_strcasecmp (name.c_str(), "Play")) { return Play; } - if (!g_strcasecmp (name.c_str(), "Record")) { return Record; } - if (!g_strcasecmp (name.c_str(), "CursorUp")) { return CursorUp; } - if (!g_strcasecmp (name.c_str(), "CursorDown")) { return CursorDown; } - if (!g_strcasecmp (name.c_str(), "CursorLeft")) { return CursorLeft; } - if (!g_strcasecmp (name.c_str(), "CursorRight")) { return CursorRight; } - if (!g_strcasecmp (name.c_str(), "Zoom")) { return Zoom; } - if (!g_strcasecmp (name.c_str(), "Scrub")) { return Scrub; } - if (!g_strcasecmp (name.c_str(), "UserA")) { return UserA; } - if (!g_strcasecmp (name.c_str(), "UserB")) { return UserB; } - if (!g_strcasecmp (name.c_str(), "Snapshot")) { return Snapshot; } - if (!g_strcasecmp (name.c_str(), "Read")) { return Read; } - if (!g_strcasecmp (name.c_str(), "Write")) { return Write; } - if (!g_strcasecmp (name.c_str(), "FdrGroup")) { return FdrGroup; } - if (!g_strcasecmp (name.c_str(), "ClearSolo")) { return ClearSolo; } - if (!g_strcasecmp (name.c_str(), "Track")) { return Track; } - if (!g_strcasecmp (name.c_str(), "Send")) { return Send; } - if (!g_strcasecmp (name.c_str(), "MidiTracks")) { return MidiTracks; } - if (!g_strcasecmp (name.c_str(), "Inputs")) { return Inputs; } - if (!g_strcasecmp (name.c_str(), "AudioTracks")) { return AudioTracks; } - if (!g_strcasecmp (name.c_str(), "AudioInstruments")) { return AudioInstruments; } - if (!g_strcasecmp (name.c_str(), "Aux")) { return Aux; } - if (!g_strcasecmp (name.c_str(), "Busses")) { return Busses; } - if (!g_strcasecmp (name.c_str(), "Outputs")) { return Outputs; } - if (!g_strcasecmp (name.c_str(), "User")) { return User; } - if (!g_strcasecmp (name.c_str(), "Trim")) { return Trim; } - if (!g_strcasecmp (name.c_str(), "Latch")) { return Latch; } - if (!g_strcasecmp (name.c_str(), "Grp")) { return Grp; } - if (!g_strcasecmp (name.c_str(), "Nudge")) { return Nudge; } - if (!g_strcasecmp (name.c_str(), "Drop")) { return Drop; } - if (!g_strcasecmp (name.c_str(), "Replace")) { return Replace; } - if (!g_strcasecmp (name.c_str(), "Click")) { return Click; } - if (!g_strcasecmp (name.c_str(), "View")) { return View; } + if (!g_ascii_strcasecmp (name.c_str(), "IO")) { return IO; } + if (!g_ascii_strcasecmp (name.c_str(), "Sends")) { return Sends; } + if (!g_ascii_strcasecmp (name.c_str(), "Pan")) { return Pan; } + if (!g_ascii_strcasecmp (name.c_str(), "Plugin")) { return Plugin; } + if (!g_ascii_strcasecmp (name.c_str(), "Eq")) { return Eq; } + if (!g_ascii_strcasecmp (name.c_str(), "Dyn")) { return Dyn; } + if (!g_ascii_strcasecmp (name.c_str(), "Left")) { return Left; } + if (!g_ascii_strcasecmp (name.c_str(), "Right")) { return Right; } + if (!g_ascii_strcasecmp (name.c_str(), "ChannelLeft")) { return ChannelLeft; } + if (!g_ascii_strcasecmp (name.c_str(), "ChannelRight")) { return ChannelRight; } + if (!g_ascii_strcasecmp (name.c_str(), "Flip")) { return Flip; } + if (!g_ascii_strcasecmp (name.c_str(), "Edit")) { return Edit; } + if (!g_ascii_strcasecmp (name.c_str(), "Name/Value")) { return NameValue; } + if (!g_ascii_strcasecmp (name.c_str(), "Timecode/Beats")) { return TimecodeBeats; } + if (!g_ascii_strcasecmp (name.c_str(), "F1")) { return F1; } + if (!g_ascii_strcasecmp (name.c_str(), "F2")) { return F2; } + if (!g_ascii_strcasecmp (name.c_str(), "F3")) { return F3; } + if (!g_ascii_strcasecmp (name.c_str(), "F4")) { return F4; } + if (!g_ascii_strcasecmp (name.c_str(), "F5")) { return F5; } + if (!g_ascii_strcasecmp (name.c_str(), "F6")) { return F6; } + if (!g_ascii_strcasecmp (name.c_str(), "F7")) { return F7; } + if (!g_ascii_strcasecmp (name.c_str(), "F8")) { return F8; } + if (!g_ascii_strcasecmp (name.c_str(), "F9")) { return F9; } + if (!g_ascii_strcasecmp (name.c_str(), "F10")) { return F10; } + if (!g_ascii_strcasecmp (name.c_str(), "F11")) { return F11; } + if (!g_ascii_strcasecmp (name.c_str(), "F12")) { return F12; } + if (!g_ascii_strcasecmp (name.c_str(), "F13")) { return F13; } + if (!g_ascii_strcasecmp (name.c_str(), "F14")) { return F14; } + if (!g_ascii_strcasecmp (name.c_str(), "F15")) { return F15; } + if (!g_ascii_strcasecmp (name.c_str(), "F16")) { return F16; } + if (!g_ascii_strcasecmp (name.c_str(), "Shift")) { return Shift; } + if (!g_ascii_strcasecmp (name.c_str(), "Option")) { return Option; } + if (!g_ascii_strcasecmp (name.c_str(), "Ctrl")) { return Ctrl; } + if (!g_ascii_strcasecmp (name.c_str(), "CmdAlt")) { return CmdAlt; } + if (!g_ascii_strcasecmp (name.c_str(), "On")) { return On; } + if (!g_ascii_strcasecmp (name.c_str(), "RecReady")) { return RecReady; } + if (!g_ascii_strcasecmp (name.c_str(), "Undo")) { return Undo; } + if (!g_ascii_strcasecmp (name.c_str(), "Save")) { return Save; } + if (!g_ascii_strcasecmp (name.c_str(), "Touch")) { return Touch; } + if (!g_ascii_strcasecmp (name.c_str(), "Redo")) { return Redo; } + if (!g_ascii_strcasecmp (name.c_str(), "Marker")) { return Marker; } + if (!g_ascii_strcasecmp (name.c_str(), "Enter")) { return Enter; } + if (!g_ascii_strcasecmp (name.c_str(), "Cancel")) { return Cancel; } + if (!g_ascii_strcasecmp (name.c_str(), "Mixer")) { return Mixer; } + if (!g_ascii_strcasecmp (name.c_str(), "FrmLeft")) { return FrmLeft; } + if (!g_ascii_strcasecmp (name.c_str(), "FrmRight")) { return FrmRight; } + if (!g_ascii_strcasecmp (name.c_str(), "Loop")) { return Loop; } + if (!g_ascii_strcasecmp (name.c_str(), "PunchIn")) { return PunchIn; } + if (!g_ascii_strcasecmp (name.c_str(), "PunchOut")) { return PunchOut; } + if (!g_ascii_strcasecmp (name.c_str(), "Home")) { return Home; } + if (!g_ascii_strcasecmp (name.c_str(), "End")) { return End; } + if (!g_ascii_strcasecmp (name.c_str(), "Rewind")) { return Rewind; } + if (!g_ascii_strcasecmp (name.c_str(), "Ffwd")) { return Ffwd; } + if (!g_ascii_strcasecmp (name.c_str(), "Stop")) { return Stop; } + if (!g_ascii_strcasecmp (name.c_str(), "Play")) { return Play; } + if (!g_ascii_strcasecmp (name.c_str(), "Record")) { return Record; } + if (!g_ascii_strcasecmp (name.c_str(), "CursorUp")) { return CursorUp; } + if (!g_ascii_strcasecmp (name.c_str(), "CursorDown")) { return CursorDown; } + if (!g_ascii_strcasecmp (name.c_str(), "CursorLeft")) { return CursorLeft; } + if (!g_ascii_strcasecmp (name.c_str(), "CursorRight")) { return CursorRight; } + if (!g_ascii_strcasecmp (name.c_str(), "Zoom")) { return Zoom; } + if (!g_ascii_strcasecmp (name.c_str(), "Scrub")) { return Scrub; } + if (!g_ascii_strcasecmp (name.c_str(), "UserA")) { return UserA; } + if (!g_ascii_strcasecmp (name.c_str(), "UserB")) { return UserB; } + if (!g_ascii_strcasecmp (name.c_str(), "Snapshot")) { return Snapshot; } + if (!g_ascii_strcasecmp (name.c_str(), "Read")) { return Read; } + if (!g_ascii_strcasecmp (name.c_str(), "Write")) { return Write; } + if (!g_ascii_strcasecmp (name.c_str(), "FdrGroup")) { return FdrGroup; } + if (!g_ascii_strcasecmp (name.c_str(), "ClearSolo")) { return ClearSolo; } + if (!g_ascii_strcasecmp (name.c_str(), "Track")) { return Track; } + if (!g_ascii_strcasecmp (name.c_str(), "Send")) { return Send; } + if (!g_ascii_strcasecmp (name.c_str(), "MidiTracks")) { return MidiTracks; } + if (!g_ascii_strcasecmp (name.c_str(), "Inputs")) { return Inputs; } + if (!g_ascii_strcasecmp (name.c_str(), "AudioTracks")) { return AudioTracks; } + if (!g_ascii_strcasecmp (name.c_str(), "AudioInstruments")) { return AudioInstruments; } + if (!g_ascii_strcasecmp (name.c_str(), "Aux")) { return Aux; } + if (!g_ascii_strcasecmp (name.c_str(), "Busses")) { return Busses; } + if (!g_ascii_strcasecmp (name.c_str(), "Outputs")) { return Outputs; } + if (!g_ascii_strcasecmp (name.c_str(), "User")) { return User; } + if (!g_ascii_strcasecmp (name.c_str(), "Trim")) { return Trim; } + if (!g_ascii_strcasecmp (name.c_str(), "Latch")) { return Latch; } + if (!g_ascii_strcasecmp (name.c_str(), "Grp")) { return Grp; } + if (!g_ascii_strcasecmp (name.c_str(), "Nudge")) { return Nudge; } + if (!g_ascii_strcasecmp (name.c_str(), "Drop")) { return Drop; } + if (!g_ascii_strcasecmp (name.c_str(), "Replace")) { return Replace; } + if (!g_ascii_strcasecmp (name.c_str(), "Click")) { return Click; } + if (!g_ascii_strcasecmp (name.c_str(), "View")) { return View; } /* Strip buttons */ - if (!g_strcasecmp (name.c_str(), "RecEnable")) { return RecEnable; } - if (!g_strcasecmp (name.c_str(), "Solo")) { return Solo; } - if (!g_strcasecmp (name.c_str(), "Mute")) { return Mute; } - if (!g_strcasecmp (name.c_str(), "Select")) { return Select; } - if (!g_strcasecmp (name.c_str(), "VSelect")) { return VSelect; } - if (!g_strcasecmp (name.c_str(), "FaderTouch")) { return FaderTouch; } + if (!g_ascii_strcasecmp (name.c_str(), "RecEnable")) { return RecEnable; } + if (!g_ascii_strcasecmp (name.c_str(), "Solo")) { return Solo; } + if (!g_ascii_strcasecmp (name.c_str(), "Mute")) { return Mute; } + if (!g_ascii_strcasecmp (name.c_str(), "Select")) { return Select; } + if (!g_ascii_strcasecmp (name.c_str(), "VSelect")) { return VSelect; } + if (!g_ascii_strcasecmp (name.c_str(), "FaderTouch")) { return FaderTouch; } return -1; } diff --git a/libs/surfaces/mackie/strip.cc b/libs/surfaces/mackie/strip.cc index d7d9acd544..9e4c72eab4 100644 --- a/libs/surfaces/mackie/strip.cc +++ b/libs/surfaces/mackie/strip.cc @@ -130,7 +130,7 @@ Strip::add (Control & control) } void -Strip::set_route (boost::shared_ptr<Route> r, bool with_messages) +Strip::set_route (boost::shared_ptr<Route> r, bool /*with_messages*/) { if (_controls_locked) { return; @@ -419,7 +419,7 @@ Strip::notify_panner_width_changed (bool force_update) } void -Strip::select_event (Button& button, ButtonState bs) +Strip::select_event (Button&, ButtonState bs) { DEBUG_TRACE (DEBUG::MackieControl, "select button\n"); @@ -454,7 +454,7 @@ Strip::select_event (Button& button, ButtonState bs) } void -Strip::vselect_event (Button& button, ButtonState bs) +Strip::vselect_event (Button&, ButtonState bs) { if (bs == press) { @@ -480,7 +480,7 @@ Strip::vselect_event (Button& button, ButtonState bs) } void -Strip::fader_touch_event (Button& button, ButtonState bs) +Strip::fader_touch_event (Button&, ButtonState bs) { DEBUG_TRACE (DEBUG::MackieControl, string_compose ("fader touch, press ? %1\n", (bs == press))); diff --git a/libs/surfaces/mackie/surface.cc b/libs/surfaces/mackie/surface.cc index 2053a963f2..4d9ab3f877 100644 --- a/libs/surfaces/mackie/surface.cc +++ b/libs/surfaces/mackie/surface.cc @@ -494,7 +494,7 @@ Surface::host_connection_confirmation (const MidiByteArray & bytes) } void -Surface::handle_port_inactive (SurfacePort * port) +Surface::handle_port_inactive (SurfacePort*) { _active = false; } @@ -820,7 +820,7 @@ Surface::next_jog_mode () } void -Surface::set_jog_mode (JogWheel::Mode m) +Surface::set_jog_mode (JogWheel::Mode) { } |