projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Parse information from harvid independent from the locale
[ardour.git]
/
libs
/
ardour
/
audiofilesource.cc
diff --git
a/libs/ardour/audiofilesource.cc
b/libs/ardour/audiofilesource.cc
index 0c921dae8d0c12952168c3986f0b748a611b79fc..bb0b4da77446235869ecb83cb3f43e7659bcbbd5 100644
(file)
--- a/
libs/ardour/audiofilesource.cc
+++ b/
libs/ardour/audiofilesource.cc
@@
-30,6
+30,7
@@
#include <fcntl.h>
#include <errno.h>
#include <fcntl.h>
#include <errno.h>
+#include "pbd/gstdio_compat.h"
#include "pbd/convert.h"
#include "pbd/basename.h"
#include "pbd/file_utils.h"
#include "pbd/convert.h"
#include "pbd/basename.h"
#include "pbd/file_utils.h"
@@
-42,7
+43,6
@@
#include <sndfile.h>
#include <sndfile.h>
-#include <glib/gstdio.h>
#include <glibmm/miscutils.h>
#include <glibmm/fileutils.h>
#include <glibmm/threads.h>
#include <glibmm/miscutils.h>
#include <glibmm/fileutils.h>
#include <glibmm/threads.h>
@@
-61,15
+61,13
@@
#include <AudioToolbox/AudioFormat.h>
#endif // HAVE_COREAUDIO
#include <AudioToolbox/AudioFormat.h>
#endif // HAVE_COREAUDIO
-#include "i18n.h"
+#include "
pbd/
i18n.h"
using namespace std;
using namespace ARDOUR;
using namespace PBD;
using namespace Glib;
using namespace std;
using namespace ARDOUR;
using namespace PBD;
using namespace Glib;
-string AudioFileSource::peak_dir = "";
-
PBD::Signal0<void> AudioFileSource::HeaderPositionOffsetChanged;
framecnt_t AudioFileSource::header_position_offset = 0;
PBD::Signal0<void> AudioFileSource::HeaderPositionOffsetChanged;
framecnt_t AudioFileSource::header_position_offset = 0;
@@
-164,17
+162,17
@@
AudioFileSource::init (const string& pathstr, bool must_exist)
}
string
}
string
-AudioFileSource::construct_peak_filepath (const string& audio_path,
bool oldformat
) const
+AudioFileSource::construct_peak_filepath (const string& audio_path,
const bool in_session, const bool old_peak_name
) const
{
string base;
{
string base;
- if (old
format
) {
+ if (old
_peak_name
) {
base = audio_path.substr (0, audio_path.find_last_of ('.'));
} else {
base = audio_path;
}
base += '%';
base += (char) ('A' + _channel);
base = audio_path.substr (0, audio_path.find_last_of ('.'));
} else {
base = audio_path;
}
base += '%';
base += (char) ('A' + _channel);
- return _session.construct_peak_filepath (base,
oldformat
);
+ return _session.construct_peak_filepath (base,
in_session, old_peak_name
);
}
bool
}
bool
@@
-270,7
+268,7
@@
AudioFileSource::setup_peakfile ()
return 0;
}
if (!(_flags & NoPeakFile)) {
return 0;
}
if (!(_flags & NoPeakFile)) {
- return initialize_peakfile (_path);
+ return initialize_peakfile (_path
, within_session()
);
} else {
return 0;
}
} else {
return 0;
}
@@
-345,4
+343,4
@@
AudioFileSource::get_interleave_buffer (framecnt_t size)
return ssb->buf;
}
return ssb->buf;
}
-
+