#include <sndfile.h>
+#include <glib/gstdio.h>
#include <glibmm/miscutils.h>
#include <glibmm/fileutils.h>
-#include <glibmm/thread.h>
+#include <glibmm/threads.h>
#include "ardour/audiofilesource.h"
#include "ardour/debug.h"
-#include "ardour/sndfile_helpers.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
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";
struct SizedSampleBuffer {
- nframes_t size;
- Sample* buf;
+ framecnt_t size;
+ Sample* buf;
- SizedSampleBuffer (nframes_t sz) : size (sz) {
- buf = new Sample[size];
- }
+ SizedSampleBuffer (framecnt_t sz) : size (sz) {
+ buf = new Sample[size];
+ }
- ~SizedSampleBuffer() {
- delete [] buf;
- }
+ ~SizedSampleBuffer() {
+ delete [] buf;
+ }
};
-Glib::StaticPrivate<SizedSampleBuffer> thread_interleave_buffer = GLIBMM_STATIC_PRIVATE_INIT;
+Glib::Threads::Private<SizedSampleBuffer> thread_interleave_buffer;
-/** Constructor used for existing internal-to-session files. */
+/** Constructor used for existing external-to-session files. */
AudioFileSource::AudioFileSource (Session& s, const string& path, Source::Flag flags)
: Source (s, DataType::AUDIO, path, flags)
, AudioSource (s, path)
- , FileSource (s, DataType::AUDIO, path, flags)
+ /* note that external files have their own path as "origin" */
+ , FileSource (s, DataType::AUDIO, path, path, flags)
{
if (init (_path, true)) {
throw failed_constructor ();
}
-
}
/** Constructor used for new internal-to-session files. */
-AudioFileSource::AudioFileSource (Session& s, const string& path, Source::Flag flags,
+AudioFileSource::AudioFileSource (Session& s, const string& path, const string& origin, Source::Flag flags,
SampleFormat /*samp_format*/, HeaderFormat /*hdr_format*/)
: Source (s, DataType::AUDIO, path, flags)
, AudioSource (s, path)
- , FileSource (s, DataType::AUDIO, path, flags)
+ , FileSource (s, DataType::AUDIO, path, origin, flags)
{
+ /* note that origin remains empty */
+
if (init (_path, false)) {
throw failed_constructor ();
}
if (set_state (node, Stateful::loading_state_version)) {
throw failed_constructor ();
}
-
+
if (init (_path, must_exist)) {
throw failed_constructor ();
}
{
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());
}
}
int
AudioFileSource::init (const string& pathstr, bool must_exist)
{
- _peaks_built = false;
return FileSource::init (pathstr, must_exist);
}
string
AudioFileSource::broken_peak_path (string audio_path)
{
- return _session.peak_path (audio_path);
+ return _session.peak_path (basename_nosuffix (audio_path));
}
string
if (SndFileSource::get_soundfile_info (path, _info, error_msg) != 0) {
return true;
}
-
+
#ifdef HAVE_COREAUDIO
if (CoreAudioSource::get_soundfile_info (path, _info, error_msg) == 0) {
return true;
char buf[32];
snprintf (buf, sizeof (buf), "%u", _channel);
root.add_property (X_("channel"), buf);
+ root.add_property (X_("origin"), _origin);
return root;
}
return;
}
- /* XXX notice that we're readers of _peaks_built
- but we must hold a solid lock on PeaksReady.
- */
-
- Glib::Mutex::Lock lm (_lock);
-
- if (_peaks_built) {
- PeaksReady (); /* EMIT SIGNAL */
- }
+ AudioSource::mark_streaming_write_completed ();
}
int
AudioFileSource::move_dependents_to_trash()
{
- return ::unlink (peakpath.c_str());
+ return ::g_unlink (peakpath.c_str());
}
void
-AudioFileSource::set_header_position_offset (nframes_t offset)
+AudioFileSource::set_header_position_offset (framecnt_t offset)
{
header_position_offset = offset;
HeaderPositionOffsetChanged ();
AudioFileSource::setup_peakfile ()
{
if (!(_flags & NoPeakFile)) {
- return initialize_peakfile (_file_is_new, _path);
+ return initialize_peakfile (_path);
} else {
return 0;
}
}
Sample*
-AudioFileSource::get_interleave_buffer (nframes_t size)
+AudioFileSource::get_interleave_buffer (framecnt_t size)
{
SizedSampleBuffer* ssb;