diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2012-04-10 17:26:31 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-04-10 17:26:31 +0000 |
| commit | aa22f85c1be958f6d6e6ec4d1010ba4b41e0cbe9 (patch) | |
| tree | 1ea682d0fbe4b691853c36f59cce36774c008309 /libs/surfaces | |
| parent | 01c1eeb279922a7b2a4f69ef40bf52dc0f6039c0 (diff) | |
MCP: fix fader touch button IDs; remove last traces of MidiControlUI
git-svn-id: svn://localhost/ardour2/branches/3.0@11873 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/surfaces')
| -rw-r--r-- | libs/surfaces/mackie/controls.h | 2 | ||||
| -rw-r--r-- | libs/surfaces/mackie/mackie_control_protocol.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libs/surfaces/mackie/controls.h b/libs/surfaces/mackie/controls.h index ca972ed5e0..a87dc46cbf 100644 --- a/libs/surfaces/mackie/controls.h +++ b/libs/surfaces/mackie/controls.h @@ -53,7 +53,7 @@ public: fader_base_id = 0x0, pot_base_id = 0x10, jog_base_id = 0x3c, - fader_touch_button_base_id = 0x68, + fader_touch_button_base_id = 0xe0, vselect_button_base_id = 0x20, select_button_base_id = 0x18, mute_button_base_id = 0x10, diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc index 331fd4f861..1eab8bf1d4 100644 --- a/libs/surfaces/mackie/mackie_control_protocol.cc +++ b/libs/surfaces/mackie/mackie_control_protocol.cc @@ -93,7 +93,7 @@ bool MackieControlProtocol::probe() } MackieControlProtocol::MackieControlProtocol (Session& session) - : ControlProtocol (session, X_("Mackie"), MidiControlUI::instance()) + : ControlProtocol (session, X_("Mackie"), this) , AbstractUI<MackieControlUIRequest> ("mackie") , _current_initial_bank (0) , _timecode_type (ARDOUR::AnyTime::BBT) @@ -337,7 +337,7 @@ MackieControlProtocol::set_active (bool yn) Glib::RefPtr<Glib::TimeoutSource> periodic_timeout = Glib::TimeoutSource::create (100); // milliseconds periodic_connection = periodic_timeout->connect (sigc::mem_fun (*this, &MackieControlProtocol::periodic)); - periodic_timeout->attach (MidiControlUI::instance()->main_loop()->get_context()); + periodic_timeout->attach (main_loop()->get_context()); } else { BaseUI::quit (); |