ardour/livetrax
13
0
Fork 0
Code

FP8: Allow binding "Select" to a controllable or functor

Browse Source
This commit is contained in:
Robin Gareus 2017-04-14 22:46:41 +02:00
parent 57dfc0ffb1
commit 7197231f4c
2 changed files with 56 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
libs/surfaces/faderport8/fp8_strip.cc
View File

@ -144,9 +144,25 @@ GENERATE_SET_CTRL_FUNCTION (mute)
GENERATE_SET_CTRL_FUNCTION (solo)
GENERATE_SET_CTRL_FUNCTION (rec)
GENERATE_SET_CTRL_FUNCTION (pan)
GENERATE_SET_CTRL_FUNCTION (x_select)
#undef GENERATE_SET_CTRL_FUNCTION
// special case -- w/_select_plugin_functor
void
FP8Strip::set_select_controllable (boost::shared_ptr<AutomationControl> ac)
{
_select_plugin_functor.clear ();
set_x_select_controllable (ac);
}
void
FP8Strip::set_select_cb (boost::function<void ()>& functor)
{
set_select_controllable (boost::shared_ptr<AutomationControl>());
_select_plugin_functor = functor;
}
void
FP8Strip::unset_controllables (int which)
{
@ -169,7 +185,7 @@ FP8Strip::unset_controllables (int which)
set_pan_controllable (boost::shared_ptr<AutomationControl>());
}
if (which & CTRL_SELECT) {
_select_plugin_functor.clear ();
set_select_controllable (boost::shared_ptr<AutomationControl>());
select_button ().set_color (0xffffffff);
select_button ().set_active (false);
select_button ().set_blinking (false);
@ -220,7 +236,7 @@ FP8Strip::set_stripable (boost::shared_ptr<Stripable> s, bool panmode)
_peak_meter = s->peak_meter ();
_redux_ctrl = s->comp_redux_controllable ();
_select_plugin_functor.clear ();
set_select_controllable (boost::shared_ptr<AutomationControl>());
select_button ().set_active (s->is_selected ());
select_button ().set_color (s->presentation_info ().color());
//select_button ().set_blinking (false);
@ -232,13 +248,6 @@ FP8Strip::set_stripable (boost::shared_ptr<Stripable> s, bool panmode)
set_text_line (0x03, "");
}
void
FP8Strip::set_select_cb (boost::function<void ()>& functor)
{
_select_plugin_functor.clear ();
_select_plugin_functor = functor;
}
/* *****************************************************************************
* Parse Strip Specifig MIDI Events
*/
@ -319,17 +328,23 @@ void
FP8Strip::set_recarm ()
{
if (_rec_ctrl) {
const bool on = !recarm_button().is_active();
const bool on = !recarm_button ().is_active();
_rec_ctrl->set_value (on ? 1.0 : 0.0, group_mode ());
}
}
void
FP8Strip::set_select ()
{
if (!_select_plugin_functor.empty ()) {
assert (!_x_select_ctrl);
_select_plugin_functor ();
} else if (_x_select_ctrl) {
if (!_x_select_ctrl->touching ()) {
_x_select_ctrl->start_touch (_x_select_ctrl->session().transport_frame());
}
const bool on = !select_button ().is_active();
_x_select_ctrl->set_value (on ? 1.0 : 0.0, group_mode ());
}
}
@ -389,6 +404,25 @@ FP8Strip::notify_rec_changed ()
void
FP8Strip::notify_pan_changed ()
{
// display only
}
void
FP8Strip::notify_x_select_changed ()
{
if (!_select_plugin_functor.empty ()) {
assert (!_x_select_ctrl);
return;
}
if (_x_select_ctrl) {
assert (_select_plugin_functor.empty ());
select_button ().set_active (_x_select_ctrl->get_value() > 0.);
select_button ().set_color (0xffff00ff);
select_button ().set_blinking (false);
} else {
; // leave alone.
}
}
/* *****************************************************************************

16
libs/surfaces/faderport8/fp8_strip.h
View File

@ -87,11 +87,12 @@ public:
void unset_controllables (int which = CTRL_ALL);
void set_fader_controllable (boost::shared_ptr<ARDOUR::AutomationControl>);
void set_mute_controllable (boost::shared_ptr<ARDOUR::AutomationControl>);
void set_solo_controllable (boost::shared_ptr<ARDOUR::AutomationControl>);
void set_rec_controllable (boost::shared_ptr<ARDOUR::AutomationControl>);
void set_pan_controllable (boost::shared_ptr<ARDOUR::AutomationControl>);
void set_fader_controllable (boost::shared_ptr<ARDOUR::AutomationControl>);
void set_mute_controllable (boost::shared_ptr<ARDOUR::AutomationControl>);
void set_solo_controllable (boost::shared_ptr<ARDOUR::AutomationControl>);
void set_rec_controllable (boost::shared_ptr<ARDOUR::AutomationControl>);
void set_pan_controllable (boost::shared_ptr<ARDOUR::AutomationControl>);
void set_select_controllable (boost::shared_ptr<ARDOUR::AutomationControl>);
private:
FP8Base& _base;
@ -112,15 +113,19 @@ private:
boost::shared_ptr<ARDOUR::AutomationControl> _solo_ctrl;
boost::shared_ptr<ARDOUR::AutomationControl> _rec_ctrl;
boost::shared_ptr<ARDOUR::AutomationControl> _pan_ctrl;
boost::shared_ptr<ARDOUR::AutomationControl> _x_select_ctrl;
PBD::ScopedConnection _fader_connection;
PBD::ScopedConnection _mute_connection;
PBD::ScopedConnection _solo_connection;
PBD::ScopedConnection _rec_connection;
PBD::ScopedConnection _pan_connection;
PBD::ScopedConnection _x_select_connection;
boost::shared_ptr<ARDOUR::PeakMeter> _peak_meter;
boost::shared_ptr<ARDOUR::ReadOnlyControl> _redux_ctrl;
void set_x_select_controllable (boost::shared_ptr<ARDOUR::AutomationControl>);
boost::function<void ()> _select_plugin_functor;
PBD::Controllable::GroupControlDisposition group_mode () const;
@ -131,6 +136,7 @@ private:
void notify_mute_changed ();
void notify_rec_changed ();
void notify_pan_changed ();
void notify_x_select_changed ();
/* actions, update model */
void set_mute (bool);