summaryrefslogtreecommitdiff
path: root/libs/surfaces/mackie/surface.h
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2012-06-09 19:06:52 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2012-06-09 19:06:52 +0000
commit71427323ec851ee6271dcc93f26dfc3bc0a51b1f (patch)
tree5ebdec0eacb93ae391e247105a50c6ac8a897dcc /libs/surfaces/mackie/surface.h
parent94b6c7626c6e2b7ceda1ba1302aae2d10fd19e28 (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/surface.h')
-rw-r--r--libs/surfaces/mackie/surface.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/surfaces/mackie/surface.h b/libs/surfaces/mackie/surface.h
index 1e33d117a5..1e66a47893 100644
--- a/libs/surfaces/mackie/surface.h
+++ b/libs/surfaces/mackie/surface.h
@@ -160,12 +160,13 @@ public:
bool _connected;
Mackie::JogWheel* _jog_wheel;
Fader* _master_fader;
+ float _last_master_gain_written;
void handle_midi_sysex (MIDI::Parser&, MIDI::byte *, size_t count);
MidiByteArray host_connection_query (MidiByteArray& bytes);
MidiByteArray host_connection_confirmation (const MidiByteArray& bytes);
- void init_controls();
+ void init_controls ();
void init_strips (uint32_t n);
void setup_master ();
void master_gain_changed ();