smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-10 16:46:35 +01:00
Code Issues Projects Releases Wiki Activity

MCP: fix fader touch button IDs; remove last traces of MidiControlUI

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@11873 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-04-10 17:26:31 +00:00
parent 01c1eeb279
commit aa22f85c1b
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libs/surfaces/mackie/controls.h
View file

@ -53,7 +53,7 @@ public:
fader_base_id = 0x0, fader_base_id = 0x0,
pot_base_id = 0x10, pot_base_id = 0x10,
jog_base_id = 0x3c, jog_base_id = 0x3c,
fader_touch_button_base_id = 0x68, fader_touch_button_base_id = 0xe0,
vselect_button_base_id = 0x20, vselect_button_base_id = 0x20,
select_button_base_id = 0x18, select_button_base_id = 0x18,
mute_button_base_id = 0x10, mute_button_base_id = 0x10,

4
libs/surfaces/mackie/mackie_control_protocol.cc
View file

@ -93,7 +93,7 @@ bool MackieControlProtocol::probe()
} }
MackieControlProtocol::MackieControlProtocol (Session& session) MackieControlProtocol::MackieControlProtocol (Session& session)
: ControlProtocol (session, X_("Mackie"), MidiControlUI::instance()) : ControlProtocol (session, X_("Mackie"), this)
, AbstractUI<MackieControlUIRequest> ("mackie") , AbstractUI<MackieControlUIRequest> ("mackie")
, _current_initial_bank (0) , _current_initial_bank (0)
, _timecode_type (ARDOUR::AnyTime::BBT) , _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 Glib::RefPtr<Glib::TimeoutSource> periodic_timeout = Glib::TimeoutSource::create (100); // milliseconds
periodic_connection = periodic_timeout->connect (sigc::mem_fun (*this, &MackieControlProtocol::periodic)); 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 { } else {
BaseUI::quit (); BaseUI::quit ();