projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix #6227, ‘old_peak_path()’ does not exist on win.
[ardour.git]
/
libs
/
ardour
/
audiofilesource.cc
diff --git
a/libs/ardour/audiofilesource.cc
b/libs/ardour/audiofilesource.cc
index 7d34b9d9a52c5aabb81fa4bbfa7d11c13acbb774..2523a85b1a6c74ce02e871288794c0cca1a517dc 100644
(file)
--- a/
libs/ardour/audiofilesource.cc
+++ b/
libs/ardour/audiofilesource.cc
@@
-32,6
+32,7
@@
#include "pbd/convert.h"
#include "pbd/basename.h"
#include "pbd/convert.h"
#include "pbd/basename.h"
+#include "pbd/file_utils.h"
#include "pbd/mountpoint.h"
#include "pbd/stl_delete.h"
#include "pbd/strsplit.h"
#include "pbd/mountpoint.h"
#include "pbd/stl_delete.h"
#include "pbd/strsplit.h"
@@
-204,12
+205,12
@@
AudioFileSource::find_broken_peakfile (string peak_path, string audio_path)
/* Nasty band-aid for older sessions that were created before we
used libsndfile for all audio files.
*/
/* Nasty band-aid for older sessions that were created before we
used libsndfile for all audio files.
*/
-
-
+#ifndef PLATFORM_WINDOWS // there's no old_peak_path() for windows
str = old_peak_path (audio_path);
if (Glib::file_test (str, Glib::FILE_TEST_EXISTS)) {
peak_path = str;
}
str = old_peak_path (audio_path);
if (Glib::file_test (str, Glib::FILE_TEST_EXISTS)) {
peak_path = str;
}
+#endif
}
return peak_path;
}
return peak_path;
@@
-236,7
+237,10
@@
AudioFileSource::old_peak_path (string audio_path)
char buf[32];
#ifdef __APPLE__
char buf[32];
#ifdef __APPLE__
- snprintf (buf, sizeof (buf), "%u-%u-%d.peak", stat_mount.st_ino, stat_file.st_ino, _channel);
+ snprintf (buf, sizeof (buf), "%llu-%llu-%d.peak",
+ (unsigned long long)stat_mount.st_ino,
+ (unsigned long long)stat_file.st_ino,
+ _channel);
#else
snprintf (buf, sizeof (buf), "%" PRId64 "-%" PRId64 "-%d.peak", (int64_t) stat_mount.st_ino, (int64_t) stat_file.st_ino, _channel);
#endif
#else
snprintf (buf, sizeof (buf), "%" PRId64 "-%" PRId64 "-%d.peak", (int64_t) stat_mount.st_ino, (int64_t) stat_file.st_ino, _channel);
#endif
@@
-298,13
+302,13
@@
AudioFileSource::set_state (const XMLNode& node, int version)
}
void
}
void
-AudioFileSource::mark_streaming_write_completed ()
+AudioFileSource::mark_streaming_write_completed (
const Lock& lock
)
{
if (!writable()) {
return;
}
{
if (!writable()) {
return;
}
- AudioSource::mark_streaming_write_completed ();
+ AudioSource::mark_streaming_write_completed (
lock
);
}
int
}
int
@@
-413,3
+417,4
@@
AudioFileSource::get_interleave_buffer (framecnt_t size)
return ssb->buf;
}
return ssb->buf;
}
+