ardour/livetrax
13
0
Fork 0
Code

explicitly drop control surface protocols before disconnecting from engine.

Browse Source 
This is not bomb/thread proof yet, because it still requires at least one process callback to function
This commit is contained in:
Paul Davis 2015-10-02 19:22:16 -04:00
parent fd4a34251c
commit 3bc7f863ca
3 changed files with 35 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libs/ardour/ardour/control_protocol_manager.h
View File

@ -64,8 +64,9 @@ class LIBARDOUR_API ControlProtocolManager : public PBD::Stateful, public ARDOUR
void foreach_known_protocol (boost::function<void(const ControlProtocolInfo*)>); void foreach_known_protocol (boost::function<void(const ControlProtocolInfo*)>);
void load_mandatory_protocols (); void load_mandatory_protocols ();
void midi_connectivity_established (); void midi_connectivity_established ();
void drop_protocols ();
int activate (ControlProtocolInfo&);
int activate (ControlProtocolInfo&);
int deactivate (ControlProtocolInfo&); int deactivate (ControlProtocolInfo&);
std::list<ControlProtocolInfo*> control_protocol_info; std::list<ControlProtocolInfo*> control_protocol_info;

43
libs/ardour/control_protocol_manager.cc
View File

@ -126,26 +126,35 @@ void
ControlProtocolManager::session_going_away() ControlProtocolManager::session_going_away()
{ {
SessionHandlePtr::session_going_away (); SessionHandlePtr::session_going_away ();
/* Session::destroy() will explicitly call drop_protocols() so we don't
* have to worry about that here.
*/
}
{ void
Glib::Threads::Mutex::Lock lm (protocols_lock); ControlProtocolManager::drop_protocols ()
{
for (list<ControlProtocol*>::iterator p = control_protocols.begin(); p != control_protocols.end(); ++p) { /* called explicitly by Session::destroy() so that we can clean up
delete *p; * before the process cycle stops and ports vanish.
} */
control_protocols.clear (); Glib::Threads::Mutex::Lock lm (protocols_lock);
for (list<ControlProtocolInfo*>::iterator p = control_protocol_info.begin(); p != control_protocol_info.end(); ++p) { for (list<ControlProtocol*>::iterator p = control_protocols.begin(); p != control_protocols.end(); ++p) {
// mark existing protocols as requested delete *p;
// otherwise the ControlProtocol instances are not recreated in set_session }
if ((*p)->protocol) {
(*p)->requested = true; control_protocols.clear ();
(*p)->protocol = 0;
} for (list<ControlProtocolInfo*>::iterator p = control_protocol_info.begin(); p != control_protocol_info.end(); ++p) {
// mark existing protocols as requested
// otherwise the ControlProtocol instances are not recreated in set_session
if ((*p)->protocol) {
(*p)->requested = true;
(*p)->protocol = 0;
} }
} }
} }
ControlProtocol* ControlProtocol*
ControlProtocolManager::instantiate (ControlProtocolInfo& cpi) ControlProtocolManager::instantiate (ControlProtocolInfo& cpi)

6
libs/ardour/session.cc
View File

@ -551,6 +551,12 @@ Session::destroy ()
drop_connections (); drop_connections ();
/* shutdown control surface protocols while we still have ports
and the engine to move data to any devices.
*/
ControlProtocolManager::instance().drop_protocols ();
_engine.remove_session (); _engine.remove_session ();
#ifdef USE_TRACKS_CODE_FEATURES #ifdef USE_TRACKS_CODE_FEATURES