ardour/livetrax
13
0
Fork 0
Code

add new API to ControlProtocol to allow GUI to specify left-most mixer strip

Browse Source 
Subject To Change. Mileage May Vary. Offer Not Good In All Territories.
This commit is contained in:
Paul Davis 2017-02-01 11:46:42 +01:00
parent bb74bba1c7
commit 0f4530af0d
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libs/surfaces/control_protocol/control_protocol.cc
View File

@ -57,7 +57,7 @@ PBD::Signal0<void> ControlProtocol::ClearStripableSelection;
PBD::Signal1<void,StripableNotificationListPtr> ControlProtocol::StripableSelectionChanged; PBD::Signal1<void,StripableNotificationListPtr> ControlProtocol::StripableSelectionChanged;
Glib::Threads::Mutex ControlProtocol::first_selected_mutex; Glib::Threads::Mutex ControlProtocol::special_stripable_mutex;
boost::weak_ptr<Stripable> ControlProtocol::_first_selected_stripable; boost::weak_ptr<Stripable> ControlProtocol::_first_selected_stripable;
StripableNotificationList ControlProtocol::_last_selected; StripableNotificationList ControlProtocol::_last_selected;
bool ControlProtocol::selection_connected = false; bool ControlProtocol::selection_connected = false;
@ -346,14 +346,28 @@ ControlProtocol::set_state (XMLNode const & node, int /* version */)
boost::shared_ptr<Stripable> boost::shared_ptr<Stripable>
ControlProtocol::first_selected_stripable () ControlProtocol::first_selected_stripable ()
{ {
Glib::Threads::Mutex::Lock lm (first_selected_mutex); Glib::Threads::Mutex::Lock lm (special_stripable_mutex);
return _first_selected_stripable.lock(); return _first_selected_stripable.lock();
} }
boost::shared_ptr<Stripable>
ControlProtocol::leftmost_mixer_stripable ()
{
Glib::Threads::Mutex::Lock lm (special_stripable_mutex);
return _first_selected_stripable.lock();
}
void
ControlProtocol::set_leftmost_mixer_stripable (boost::shared_ptr<Stripable> s)
{
Glib::Threads::Mutex::Lock lm (special_stripable_mutex);
_first_selected_stripable = s;
}
void void
ControlProtocol::set_first_selected_stripable (boost::shared_ptr<Stripable> s) ControlProtocol::set_first_selected_stripable (boost::shared_ptr<Stripable> s)
{ {
Glib::Threads::Mutex::Lock lm (first_selected_mutex); Glib::Threads::Mutex::Lock lm (special_stripable_mutex);
_first_selected_stripable = s; _first_selected_stripable = s;
} }
@ -365,7 +379,7 @@ ControlProtocol::stripable_selection_changed (StripableNotificationListPtr sp)
_last_selected = *sp; _last_selected = *sp;
{ {
Glib::Threads::Mutex::Lock lm (first_selected_mutex); Glib::Threads::Mutex::Lock lm (special_stripable_mutex);
if (!_last_selected.empty()) { if (!_last_selected.empty()) {
if (!had_selection) { if (!had_selection) {

6
libs/surfaces/control_protocol/control_protocol/control_protocol.h
View File

@ -95,6 +95,9 @@ class LIBCONTROLCP_API ControlProtocol : public PBD::Stateful, public PBD::Scope
static boost::shared_ptr<ARDOUR::Stripable> first_selected_stripable (); static boost::shared_ptr<ARDOUR::Stripable> first_selected_stripable ();
static void set_first_selected_stripable (boost::shared_ptr<ARDOUR::Stripable>); static void set_first_selected_stripable (boost::shared_ptr<ARDOUR::Stripable>);
static boost::shared_ptr<ARDOUR::Stripable> leftmost_mixer_stripable ();
static void set_leftmost_mixer_stripable (boost::shared_ptr<ARDOUR::Stripable>);
/* the model here is as follows: /* the model here is as follows:
we imagine most control surfaces being able to control we imagine most control surfaces being able to control
@ -156,7 +159,8 @@ class LIBCONTROLCP_API ControlProtocol : public PBD::Stateful, public PBD::Scope
bool _active; bool _active;
static Glib::Threads::Mutex first_selected_mutex; static Glib::Threads::Mutex special_stripable_mutex;
static boost::weak_ptr<ARDOUR::Stripable> _leftmost_mixer_stripable;
static boost::weak_ptr<ARDOUR::Stripable> _first_selected_stripable; static boost::weak_ptr<ARDOUR::Stripable> _first_selected_stripable;
static StripableNotificationList _last_selected; static StripableNotificationList _last_selected;
static void stripable_selection_changed (StripableNotificationListPtr); static void stripable_selection_changed (StripableNotificationListPtr);