From 3b54a75aa9c03edb32d3960c5aacba640e1901e0 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 1 Oct 2009 20:40:51 +0000 Subject: i/o button naming patch and imported file BWF timecode retention patch from nickm, both reworked for 3.0 git-svn-id: svn://localhost/ardour2/branches/3.0@5711 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/sndfileimportable.cc | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) (limited to 'libs/ardour/sndfileimportable.cc') diff --git a/libs/ardour/sndfileimportable.cc b/libs/ardour/sndfileimportable.cc index 3328eddb23..d741dd008b 100644 --- a/libs/ardour/sndfileimportable.cc +++ b/libs/ardour/sndfileimportable.cc @@ -1,14 +1,42 @@ #include "ardour/sndfileimportable.h" #include #include +#include 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 () @@ -46,3 +74,9 @@ SndFileImportableSource::seek (nframes_t /*pos*/) { sf_seek (in.get(), 0, SEEK_SET); } + +nframes64_t +SndFileImportableSource::natural_position () const +{ + return timecode; +} -- cgit v1.2.3