ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Prevent crash at session-close when analysing. 

The Analyser only holds a weak-pointer the the Source,
session-destruction frees the actual Source, which is fatal for any
ongoing audio analysis.


This fix simply waits for the current ongoing analysis to complete,
ideally TransientDetector::run, EBUr128Analysis::run, OnsetDetector::run
and AudioAnalyser::analyse could be interrupted.

Alternate option: cancel the Analyser::work thread (and re-create with
the every session).
This commit is contained in:
Robin Gareus 2015-11-25 00:55:41 +01:00
parent ff62cec27d
commit 71520c7432
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libs/ardour/analyser.cc
View File

@ -31,6 +31,7 @@ using namespace ARDOUR;
using namespace PBD;
Analyser* Analyser::the_analyser = 0;
Glib::Threads::Mutex Analyser::analysis_active_lock;
Glib::Threads::Mutex Analyser::analysis_queue_lock;
Glib::Threads::Cond Analyser::SourcesToAnalyse;
list<boost::weak_ptr<Source> > Analyser::analysis_queue;
@ -96,6 +97,7 @@ Analyser::work ()
boost::shared_ptr<AudioFileSource> afs = boost::dynamic_pointer_cast<AudioFileSource> (src);
if (afs && afs->length(afs->timeline_position())) {
Glib::Threads::Mutex::Lock lm (analysis_active_lock);
analyse_audio_file_source (afs);
}
}
@ -119,3 +121,11 @@ Analyser::analyse_audio_file_source (boost::shared_ptr<AudioFileSource> src)
return;
}
}
void
Analyser::flush ()
{
Glib::Threads::Mutex::Lock lq (analysis_queue_lock);
Glib::Threads::Mutex::Lock la (analysis_active_lock);
analysis_queue.clear();
}

6
libs/ardour/ardour/analyser.h
View File

@ -40,11 +40,13 @@ class LIBARDOUR_API Analyser {
static void init ();
static void queue_source_for_analysis (boost::shared_ptr<Source>, bool force);
static void work ();
static void flush ();
private:
static Analyser* the_analyser;
static Glib::Threads::Mutex analysis_queue_lock;
static Glib::Threads::Cond SourcesToAnalyse;
static Glib::Threads::Mutex analysis_active_lock;
static Glib::Threads::Mutex analysis_queue_lock;
static Glib::Threads::Cond SourcesToAnalyse;
static std::list<boost::weak_ptr<Source> > analysis_queue;
static void analyse_audio_file_source (boost::shared_ptr<AudioFileSource>);

2
libs/ardour/session.cc
View File

@ -544,6 +544,8 @@ Session::destroy ()
remove_pending_capture_state ();
Analyser::flush ();
_state_of_the_state = StateOfTheState (CannotSave|Deletion);
/* disconnect from any and all signals that we are connected to */