projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
enough with umpteen "i18n.h" files. Consolidate on pbd/i18n.h
[ardour.git]
/
libs
/
ardour
/
audiosource.cc
diff --git
a/libs/ardour/audiosource.cc
b/libs/ardour/audiosource.cc
index e7d81feaec284beb326339cc948f70adce573d69..123bc229180d9d70fa8e2fc7e4a95b54d3df76bd 100644
(file)
--- a/
libs/ardour/audiosource.cc
+++ b/
libs/ardour/audiosource.cc
@@
-58,7
+58,7
@@
#include "ardour/runtime_functions.h"
#include "ardour/session.h"
#include "ardour/runtime_functions.h"
#include "ardour/session.h"
-#include "i18n.h"
+#include "
pbd/
i18n.h"
#include "ardour/debug.h"
#include "ardour/debug.h"
@@
-142,7
+142,7
@@
AudioSource::get_state ()
int
AudioSource::set_state (const XMLNode& node, int /*version*/)
{
int
AudioSource::set_state (const XMLNode& node, int /*version*/)
{
-
const XMLProperty
* prop;
+
XMLProperty const
* prop;
if ((prop = node.property ("captured-for")) != 0) {
_captured_for = prop->value();
if ((prop = node.property ("captured-for")) != 0) {
_captured_for = prop->value();
@@
-238,6
+238,7
@@
AudioSource::rename_peakfile (string newpath)
int
AudioSource::initialize_peakfile (const string& audio_path, const bool in_session)
{
int
AudioSource::initialize_peakfile (const string& audio_path, const bool in_session)
{
+ Glib::Threads::Mutex::Lock lm (_initialize_peaks_lock);
GStatBuf statbuf;
_peakpath = construct_peak_filepath (audio_path, in_session);
GStatBuf statbuf;
_peakpath = construct_peak_filepath (audio_path, in_session);