X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsndfileimportable.cc;h=c9f6c4014f272f75e54b99610c2a70f7d3eebf63;hb=d90e2b42211ead2a38afd5590e2937992312795e;hp=3328eddb23e916290822a1a1d10db4f9032fd7a3;hpb=b65f8073ba306ac2d85133875746767e7c6b0eb6;p=ardour.git

diff --git a/libs/ardour/sndfileimportable.cc b/libs/ardour/sndfileimportable.cc
index 3328eddb23..c9f6c4014f 100644
--- a/libs/ardour/sndfileimportable.cc
+++ b/libs/ardour/sndfileimportable.cc
@@ -1,48 +1,91 @@
 #include "ardour/sndfileimportable.h"
 #include <sndfile.h>
 #include <iostream>
+#include <cstring>
 
 using namespace ARDOUR;
 using namespace std;
 
+/* FIXME: this was copied from sndfilesource.cc, at some point these should be merged */
+int64_t
+SndFileImportableSource::get_timecode_info (SNDFILE* sf, SF_BROADCAST_INFO* binfo, bool& exists)
+{
+	if (sf_command (sf, SFC_GET_BROADCAST_INFO, binfo, sizeof (*binfo)) != SF_TRUE) {
+		exists = false;
+		return 0;
+	}
+
+	exists = true;
+	int64_t ret = (uint32_t) binfo->time_reference_high;
+	ret <<= 32;
+	ret |= (uint32_t) binfo->time_reference_low;
+	return ret;
+}
+
 SndFileImportableSource::SndFileImportableSource (const string& path)
-	: in (sf_open (path.c_str(), SFM_READ, &sf_info), sf_close)
 {
+	memset(&sf_info, 0 , sizeof(sf_info));
+	in.reset( sf_open(path.c_str(), SFM_READ, &sf_info), sf_close);
 	if (!in) throw failed_constructor();
+
+	SF_BROADCAST_INFO binfo;
+	bool timecode_exists;
+
+	memset (&binfo, 0, sizeof (binfo));
+	timecode = get_timecode_info (in.get(), &binfo, timecode_exists);
+
+	if (!timecode_exists) {
+		timecode = 0;
+	}
 }
 
 SndFileImportableSource::~SndFileImportableSource ()
 {
 }
 
-nframes_t
-SndFileImportableSource::read (Sample* buffer, nframes_t nframes) 
+framecnt_t
+SndFileImportableSource::read (Sample* buffer, framecnt_t nframes)
 {
-	nframes_t per_channel = nframes / sf_info.channels;
+	framecnt_t per_channel = nframes / sf_info.channels;
 	per_channel = sf_readf_float (in.get(), buffer, per_channel);
 	return per_channel * sf_info.channels;
 }
 
 uint
-SndFileImportableSource::channels () const 
+SndFileImportableSource::channels () const
 {
 	return sf_info.channels;
 }
 
-nframes_t
-SndFileImportableSource::length () const 
+framecnt_t
+SndFileImportableSource::length () const
 {
-	return sf_info.frames;
+	return (framecnt_t) sf_info.frames;
 }
 
-nframes_t
-SndFileImportableSource::samplerate() const
+framecnt_t
+SndFileImportableSource::samplerate () const
 {
 	return sf_info.samplerate;
 }
 
 void
-SndFileImportableSource::seek (nframes_t /*pos*/)
+SndFileImportableSource::seek (framepos_t /*pos*/)
 {
 	sf_seek (in.get(), 0, SEEK_SET);
 }
+
+framepos_t
+SndFileImportableSource::natural_position () const
+{
+	return (framepos_t) timecode;
+}
+
+bool
+SndFileImportableSource::clamped_at_unity () const
+{
+	int const type = sf_info.format & SF_FORMAT_TYPEMASK;
+	int const sub = sf_info.format & SF_FORMAT_SUBMASK;
+	/* XXX: this may not be the full list of formats that are unclamped */
+	return (sub != SF_FORMAT_FLOAT && sub != SF_FORMAT_DOUBLE && type != SF_FORMAT_OGG);
+}