make the leftmost mixer stripable API at least work as advertised

This commit is contained in:
Paul Davis 2017-02-01 11:57:37 +01:00
parent 0f4530af0d
commit e75c713e5e

View file

@ -59,6 +59,7 @@ PBD::Signal1<void,StripableNotificationListPtr> ControlProtocol::StripableSelect
Glib::Threads::Mutex ControlProtocol::special_stripable_mutex; Glib::Threads::Mutex ControlProtocol::special_stripable_mutex;
boost::weak_ptr<Stripable> ControlProtocol::_first_selected_stripable; boost::weak_ptr<Stripable> ControlProtocol::_first_selected_stripable;
boost::weak_ptr<Stripable> ControlProtocol::_leftmost_mixer_stripable;
StripableNotificationList ControlProtocol::_last_selected; StripableNotificationList ControlProtocol::_last_selected;
bool ControlProtocol::selection_connected = false; bool ControlProtocol::selection_connected = false;
PBD::ScopedConnection ControlProtocol::selection_connection; PBD::ScopedConnection ControlProtocol::selection_connection;
@ -354,14 +355,14 @@ boost::shared_ptr<Stripable>
ControlProtocol::leftmost_mixer_stripable () ControlProtocol::leftmost_mixer_stripable ()
{ {
Glib::Threads::Mutex::Lock lm (special_stripable_mutex); Glib::Threads::Mutex::Lock lm (special_stripable_mutex);
return _first_selected_stripable.lock(); return _leftmost_mixer_stripable.lock();
} }
void void
ControlProtocol::set_leftmost_mixer_stripable (boost::shared_ptr<Stripable> s) ControlProtocol::set_leftmost_mixer_stripable (boost::shared_ptr<Stripable> s)
{ {
Glib::Threads::Mutex::Lock lm (special_stripable_mutex); Glib::Threads::Mutex::Lock lm (special_stripable_mutex);
_first_selected_stripable = s; _leftmost_mixer_stripable = s;
} }
void void