diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2012-06-09 19:06:52 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-06-09 19:06:52 +0000 |
commit | 71427323ec851ee6271dcc93f26dfc3bc0a51b1f (patch) | |
tree | 5ebdec0eacb93ae391e247105a50c6ac8a897dcc /libs/surfaces/mackie/button.cc | |
parent | 94b6c7626c6e2b7ceda1ba1302aae2d10fd19e28 (diff) |
MCP: latest patch from Rodrigo:
* fixes Master Fader Touch button in the Mackie;
* implements a MasterFaderTouch global button;
* removes unused MackieControlProtocol::_transport_previously_rolling property;
* implements DeviceInfo::get_global_button() method;
* creates GlobalButtonsInfo and StripButtonsInfo types in DeviceInfo;
* implements Surface::_last_master_gain_written property to help master fader feedback;
* makes Surface respect _mcp.device_info().strip_cnt() to create master fader and when connecting signals for strips and master fader instead of using hardcoded 8;
* removed a few unnecessary updates in Surface::turn_it_on();
* included master_gain_changed() in Surface::periodic();
* implemented MackieControlProtocol::master_fader_touch_press and
* MackieControlProtocol::master_fader_touch_release;
git-svn-id: svn://localhost/ardour2/branches/3.0@12631 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/surfaces/mackie/button.cc')
-rw-r--r-- | libs/surfaces/mackie/button.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libs/surfaces/mackie/button.cc b/libs/surfaces/mackie/button.cc index 836e7390df..8f13c4029c 100644 --- a/libs/surfaces/mackie/button.cc +++ b/libs/surfaces/mackie/button.cc @@ -136,6 +136,10 @@ Button::name_to_id (const std::string& name) if (!g_ascii_strcasecmp (name.c_str(), "VSelect")) { return VSelect; } if (!g_ascii_strcasecmp (name.c_str(), "FaderTouch")) { return FaderTouch; } + /* Master Fader button */ + + if (!g_ascii_strcasecmp (name.c_str(), "MasterFaderTouch")) { return MasterFaderTouch; } + return -1; } @@ -237,5 +241,7 @@ Button::id_to_name (Button::ID id) if (id == VSelect) { return "V-Pot"; } if (id == FaderTouch) { return "Fader Touch"; } + if (id == MasterFaderTouch) { return "Master Fader Touch"; } + return "???"; } |