X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsndfileimportable.cc;h=f900689f77f804d6032f782fd99a8f3be777c86e;hb=41abf75077921766f25aae45c87aca927244e520;hp=ceb88eddc9f80c4ae61a87b41e9c1b092a59dad3;hpb=6a436fd826d1c9d88b60287696cc0836ccce35aa;p=ardour.git

diff --git a/libs/ardour/sndfileimportable.cc b/libs/ardour/sndfileimportable.cc
index ceb88eddc9..f900689f77 100644
--- a/libs/ardour/sndfileimportable.cc
+++ b/libs/ardour/sndfileimportable.cc
@@ -1,7 +1,35 @@
-#include "ardour/sndfileimportable.h"
+/*
+    Copyright (C) 2000,2015 Paul Davis
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+*/
+
 #include <sndfile.h>
 #include <iostream>
 #include <cstring>
+#include <fcntl.h>
+
+#include <glib.h>
+#include "pbd/gstdio_compat.h"
+
+
+#include "pbd/error.h"
+#include "ardour/sndfileimportable.h"
+
+#include <glibmm/convert.h>
 
 using namespace ARDOUR;
 using namespace std;
@@ -15,17 +43,43 @@ SndFileImportableSource::get_timecode_info (SNDFILE* sf, SF_BROADCAST_INFO* binf
 		return 0;
 	}
 
+	/* see http://tracker.ardour.org/view.php?id=6208
+	 * 0xffffffff 0xfffc5680
+	 * seems to be a bug in Presonus Capture (which generated the file)
+	 *
+	 * still since samplepos_t is a signed int, ignore files that could
+	 * lead to negative timestamps for now.
+	 */
+
+	if (binfo->time_reference_high & 0x80000000) {
+		char tmp[64];
+		snprintf(tmp, sizeof(tmp), "%x%08x", binfo->time_reference_high, binfo->time_reference_low);
+		PBD::warning << "Invalid Timestamp " << tmp << endmsg;
+		exists = false;
+		return 0;
+	}
+
 	exists = true;
-	int64_t ret = (uint32_t) binfo->time_reference_high;
+	/* libsndfile reads eactly 4 bytes for high and low, but
+	 * uses "unsigned int" which may or may not be 32 bit little
+	 * endian.
+	 */
+	int64_t ret = (uint32_t) (binfo->time_reference_high & 0x7fffffff);
 	ret <<= 32;
-	ret |= (uint32_t) binfo->time_reference_low;
+	ret |= (uint32_t) (binfo->time_reference_low & 0xffffffff);
+
+	assert(ret >= 0);
 	return ret;
 }
 
 SndFileImportableSource::SndFileImportableSource (const string& path)
 {
+	int fd = g_open (path.c_str (), O_RDONLY, 0444);
+	if (fd == -1) {
+		throw failed_constructor ();
+	}
 	memset(&sf_info, 0 , sizeof(sf_info));
-	in.reset( sf_open(path.c_str(), SFM_READ, &sf_info), sf_close);
+	in.reset (sf_open_fd (fd, SFM_READ, &sf_info, true), sf_close);
 	if (!in) throw failed_constructor();
 
 	SF_BROADCAST_INFO binfo;
@@ -43,10 +97,10 @@ SndFileImportableSource::~SndFileImportableSource ()
 {
 }
 
-framecnt_t
-SndFileImportableSource::read (Sample* buffer, framecnt_t nframes)
+samplecnt_t
+SndFileImportableSource::read (Sample* buffer, samplecnt_t nframes)
 {
-	framecnt_t per_channel = nframes / sf_info.channels;
+	samplecnt_t per_channel = nframes / sf_info.channels;
 	per_channel = sf_readf_float (in.get(), buffer, per_channel);
 	return per_channel * sf_info.channels;
 }
@@ -57,28 +111,28 @@ SndFileImportableSource::channels () const
 	return sf_info.channels;
 }
 
-framecnt_t
+samplecnt_t
 SndFileImportableSource::length () const
 {
-	return (framecnt_t) sf_info.frames;
+	return (samplecnt_t) sf_info.frames;
 }
 
-framecnt_t
+samplecnt_t
 SndFileImportableSource::samplerate () const
 {
 	return sf_info.samplerate;
 }
 
 void
-SndFileImportableSource::seek (framepos_t /*pos*/)
+SndFileImportableSource::seek (samplepos_t /*pos*/)
 {
 	sf_seek (in.get(), 0, SEEK_SET);
 }
 
-framepos_t
+samplepos_t
 SndFileImportableSource::natural_position () const
 {
-	return (framepos_t) timecode;
+	return (samplepos_t) timecode;
 }
 
 bool