projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
convert from Glib:: to Glib::Threads for all thread-related API
[ardour.git]
/
libs
/
ardour
/
source.cc
diff --git
a/libs/ardour/source.cc
b/libs/ardour/source.cc
index e9e3b0014216401193dc6f64aa56761504f5d029..618dddc70b75808e63550b53a42b1fb945cb5d7b 100644
(file)
--- a/
libs/ardour/source.cc
+++ b/
libs/ardour/source.cc
@@
-29,7
+29,7
@@
#include <algorithm>
#include <fstream>
#include <algorithm>
#include <fstream>
-#include <glibmm/thread.h>
+#include <glibmm/thread
s
.h>
#include <glibmm/miscutils.h>
#include <glibmm/fileutils.h>
#include "pbd/xml++.h"
#include <glibmm/miscutils.h>
#include <glibmm/fileutils.h>
#include "pbd/xml++.h"
@@
-162,7
+162,7
@@
Source::set_state (const XMLNode& node, int version)
bool
Source::has_been_analysed() const
{
bool
Source::has_been_analysed() const
{
- Glib::Mutex::Lock lm (_analysis_lock);
+ Glib::
Threads::
Mutex::Lock lm (_analysis_lock);
return _analysed;
}
return _analysed;
}
@@
-170,7
+170,7
@@
void
Source::set_been_analysed (bool yn)
{
{
Source::set_been_analysed (bool yn)
{
{
- Glib::Mutex::Lock lm (_analysis_lock);
+ Glib::
Threads::
Mutex::Lock lm (_analysis_lock);
_analysed = yn;
}
_analysed = yn;
}
@@
-292,14
+292,14
@@
void
Source::dec_use_count ()
{
#ifndef NDEBUG
Source::dec_use_count ()
{
#ifndef NDEBUG
- gint oldval = g_atomic_int_
exchange_and_
add (&_use_count, -1);
+ gint oldval = g_atomic_int_add (&_use_count, -1);
if (oldval <= 0) {
cerr << "Bad use dec for " << name() << endl;
abort ();
}
assert (oldval > 0);
#else
if (oldval <= 0) {
cerr << "Bad use dec for " << name() << endl;
abort ();
}
assert (oldval > 0);
#else
- g_atomic_int_
exchange_and_
add (&_use_count, -1);
+ g_atomic_int_add (&_use_count, -1);
#endif
}
#endif
}