smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-06 13:45:43 +01:00
Code Issues Projects Releases Wiki Activity

Possible fix for http://tracker.ardour.org/view.php?id=6332

Browse source 
For sfdb stuff, use glib file functions in preference to ANSI or libsndfile handling. On Windows, we need functions which understand UTF-8 (so that we'll be able to import sound files, even in a non-English locale).
This commit is contained in:
John Emmas 2015-07-16 12:45:49 +01:00 • committed by Robin Gareus
parent 93b90396d2
commit 1a619472ca
3 changed files with 24 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
libs/ardour/sndfileimportable.cc
View file

@ -24,6 +24,9 @@
#include "pbd/error.h"
#include "ardour/sndfileimportable.h"
#include <fcntl.h>
#include <glib/gstdio.h>
using namespace ARDOUR;
using namespace std;
@ -67,8 +70,12 @@ SndFileImportableSource::get_timecode_info (SNDFILE* sf, SF_BROADCAST_INFO* binf
SndFileImportableSource::SndFileImportableSource (const string& path)
{
int fd;
if ((-1) == (fd = g_open (path.c_str(), O_RDONLY, 0664)))
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;

14
libs/ardour/sndfilesource.cc
View file

@ -28,6 +28,8 @@
#include <sys/stat.h>
#include <glib/gstdio.h>
#ifdef PLATFORM_WINDOWS
#include <glibmm/convert.h>
#endif
@ -39,6 +41,8 @@
#include "ardour/utils.h"
#include "ardour/session.h"
#include <fcntl.h>
#include "i18n.h"
using namespace std;
@ -921,11 +925,17 @@ SndFileSource::get_soundfile_info (const string& path, SoundFileInfo& info, stri
SNDFILE *sf;
SF_INFO sf_info;
BroadcastInfo binfo;
char errbuf[1024];
int fd;
sf_info.format = 0; // libsndfile says to clear this before sf_open().
if ((sf = sf_open (const_cast<char*>(path.c_str()), SFM_READ, &sf_info)) == 0) {
char errbuf[256];
if ((-1) == (fd = g_open (path.c_str(), O_RDONLY, 0664))) {
sprintf (errbuf, "SndFileSource::get_soundfile_info - cannot open file \"%s\"", path.c_str());
return false;
}
if ((sf = sf_open_fd (fd, SFM_READ, &sf_info, true)) == 0) {
error_msg = sf_error_str (0, errbuf, sizeof (errbuf) - 1);
return false;
}