projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update slider rendering & set style for faders
[ardour.git]
/
libs
/
ardour
/
analyser.cc
diff --git
a/libs/ardour/analyser.cc
b/libs/ardour/analyser.cc
index c19657baaf40ce9988b4b1d8f23e335dcc7586c8..bf98ecc20ab406a30c5e675c0c9ecb6337914202 100644
(file)
--- a/
libs/ardour/analyser.cc
+++ b/
libs/ardour/analyser.cc
@@
-22,16
+22,13
@@
#include "ardour/session_event.h"
#include "ardour/transient_detector.h"
#include "ardour/session_event.h"
#include "ardour/transient_detector.h"
-#include "pbd/pthread_utils.h"
-#include "pbd/convert.h"
-
using namespace std;
using namespace ARDOUR;
using namespace PBD;
Analyser* Analyser::the_analyser = 0;
using namespace std;
using namespace ARDOUR;
using namespace PBD;
Analyser* Analyser::the_analyser = 0;
-Glib::
StaticMutex Analyser::analysis_queue_lock = GLIBMM_STATIC_MUTEX_INIT
;
-Glib::
Cond* Analyser::SourcesToAnalyse = 0
;
+Glib::
Threads::Mutex Analyser::analysis_queue_lock
;
+Glib::
Threads::Cond Analyser::SourcesToAnalyse
;
list<boost::weak_ptr<Source> > Analyser::analysis_queue;
Analyser::Analyser ()
list<boost::weak_ptr<Source> > Analyser::analysis_queue;
Analyser::Analyser ()
@@
-52,8
+49,7
@@
analyser_work ()
void
Analyser::init ()
{
void
Analyser::init ()
{
- SourcesToAnalyse = new Glib::Cond();
- Glib::Thread::create (sigc::ptr_fun (analyser_work), false);
+ Glib::Threads::Thread::create (sigc::ptr_fun (analyser_work));
}
void
}
void
@@
-67,9
+63,9
@@
Analyser::queue_source_for_analysis (boost::shared_ptr<Source> src, bool force)
return;
}
return;
}
- Glib::Mutex::Lock lm (analysis_queue_lock);
+ Glib::
Threads::
Mutex::Lock lm (analysis_queue_lock);
analysis_queue.push_back (boost::weak_ptr<Source>(src));
analysis_queue.push_back (boost::weak_ptr<Source>(src));
- SourcesToAnalyse
->
broadcast ();
+ SourcesToAnalyse
.
broadcast ();
}
void
}
void
@@
-82,7
+78,7
@@
Analyser::work ()
wait:
if (analysis_queue.empty()) {
wait:
if (analysis_queue.empty()) {
- SourcesToAnalyse
->
wait (analysis_queue_lock);
+ SourcesToAnalyse
.
wait (analysis_queue_lock);
}
if (analysis_queue.empty()) {
}
if (analysis_queue.empty()) {