projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix merge conflict from master
[ardour.git]
/
libs
/
ardour
/
audiofilesource.cc
diff --git
a/libs/ardour/audiofilesource.cc
b/libs/ardour/audiofilesource.cc
index d3d3a4f4a77e85a02afc9f9d27ad2f5562450e1b..014baa90317b13c420af7c9863378ef6ddd4f976 100644
(file)
--- a/
libs/ardour/audiofilesource.cc
+++ b/
libs/ardour/audiofilesource.cc
@@
-40,17
+40,15
@@
#include <sndfile.h>
#include <sndfile.h>
+#include <glib/gstdio.h>
#include <glibmm/miscutils.h>
#include <glibmm/fileutils.h>
#include <glibmm/miscutils.h>
#include <glibmm/fileutils.h>
-#include <glibmm/thread.h>
+#include <glibmm/thread
s
.h>
#include "ardour/audiofilesource.h"
#include "ardour/debug.h"
#include "ardour/audiofilesource.h"
#include "ardour/debug.h"
-#include "ardour/sndfile_helpers.h"
#include "ardour/sndfilesource.h"
#include "ardour/session.h"
#include "ardour/sndfilesource.h"
#include "ardour/session.h"
-#include "ardour/session_directory.h"
-#include "ardour/source_factory.h"
#include "ardour/filename_extensions.h"
// if these headers come before sigc++ is included
#include "ardour/filename_extensions.h"
// if these headers come before sigc++ is included
@@
-71,7
+69,7
@@
using namespace Glib;
string AudioFileSource::peak_dir = "";
PBD::Signal0<void> AudioFileSource::HeaderPositionOffsetChanged;
string AudioFileSource::peak_dir = "";
PBD::Signal0<void> AudioFileSource::HeaderPositionOffsetChanged;
-
uint64_t
AudioFileSource::header_position_offset = 0;
+
framecnt_t
AudioFileSource::header_position_offset = 0;
/* XXX maybe this too */
char AudioFileSource::bwf_serial_number[13] = "000000000000";
/* XXX maybe this too */
char AudioFileSource::bwf_serial_number[13] = "000000000000";
@@
-89,7
+87,7
@@
struct SizedSampleBuffer {
}
};
}
};
-Glib::
StaticPrivate<SizedSampleBuffer> thread_interleave_buffer = GLIBMM_STATIC_PRIVATE_INIT
;
+Glib::
Threads::Private<SizedSampleBuffer> thread_interleave_buffer
;
/** Constructor used for existing external-to-session files. */
AudioFileSource::AudioFileSource (Session& s, const string& path, Source::Flag flags)
/** Constructor used for existing external-to-session files. */
AudioFileSource::AudioFileSource (Session& s, const string& path, Source::Flag flags)
@@
-98,12
+96,9
@@
AudioFileSource::AudioFileSource (Session& s, const string& path, Source::Flag f
/* note that external files have their own path as "origin" */
, FileSource (s, DataType::AUDIO, path, path, flags)
{
/* note that external files have their own path as "origin" */
, FileSource (s, DataType::AUDIO, path, path, flags)
{
- /* note that origin remains empty */
-
if (init (_path, true)) {
throw failed_constructor ();
}
if (init (_path, true)) {
throw failed_constructor ();
}
- cerr << "audiofile source created with path " << path << endl;
}
/** Constructor used for new internal-to-session files. */
}
/** Constructor used for new internal-to-session files. */
@@
-139,8
+134,8
@@
AudioFileSource::~AudioFileSource ()
{
DEBUG_TRACE (DEBUG::Destruction, string_compose ("AudioFileSource destructor %1, removable? %2\n", _path, removable()));
if (removable()) {
{
DEBUG_TRACE (DEBUG::Destruction, string_compose ("AudioFileSource destructor %1, removable? %2\n", _path, removable()));
if (removable()) {
- unlink (_path.c_str());
- unlink (peakpath.c_str());
+
::g_
unlink (_path.c_str());
+
::g_
unlink (peakpath.c_str());
}
}
}
}
@@
-298,7
+293,7
@@
AudioFileSource::mark_streaming_write_completed ()
int
AudioFileSource::move_dependents_to_trash()
{
int
AudioFileSource::move_dependents_to_trash()
{
- return ::unlink (peakpath.c_str());
+ return ::
g_
unlink (peakpath.c_str());
}
void
}
void
@@
-326,7
+321,7
@@
int
AudioFileSource::setup_peakfile ()
{
if (!(_flags & NoPeakFile)) {
AudioFileSource::setup_peakfile ()
{
if (!(_flags & NoPeakFile)) {
- return initialize_peakfile (_
file_is_new, _
path);
+ return initialize_peakfile (_path);
} else {
return 0;
}
} else {
return 0;
}