smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-09 15:15:41 +01:00
Code Issues Projects Releases Wiki Activity

clean up after monitoring-section on session close

Browse source
This commit is contained in:
Robin Gareus 2014-06-30 04:04:35 +02:00
parent 038d292c3f
commit 8b216111da
1 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
libs/ardour/session.cc
View file

@ -500,6 +500,14 @@ Session::destroy ()
clear_clicks ();
/* need to remove auditioner before monitoring section
* otherwise it is re-connected */
auditioner.reset ();
/* drop references to routes held by the monitoring section
* specifically _monitor_out aux/listen references */
remove_monitor_section();
/* clear out any pending dead wood from RCU managed objects */
routes.flush ();
@ -519,7 +527,6 @@ Session::destroy ()
/* reset these three references to special routes before we do the usual route delete thing */
auditioner.reset ();
_master_out.reset ();
_monitor_out.reset ();
@ -3757,6 +3764,9 @@ Session::audition_region (boost::shared_ptr<Region> r)
void
Session::cancel_audition ()
{
if (!auditioner) {
return;
}
if (auditioner->auditioning()) {
auditioner->cancel_audition ();
AuditionActive (false); /* EMIT SIGNAL */