allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

Use g_open and sf_open_fd in SndFileImportable instead of sf_open and Glib::locale_from_utf8

Browse Source
This commit is contained in:
Tim Mayberry
2015-07-25 21:31:42 +10:00
parent ecb4a76095
commit ba14063463
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libs/ardour/sndfileimportable.cc
View File

@@ -20,6 +20,11 @@
#include <sndfile.h>
#include <iostream>
#include <cstring>
#include <fcntl.h>
#include <glib.h>
#include <glib/gstdio.h>
#include "pbd/error.h"
#include "ardour/sndfileimportable.h"
@@ -69,8 +74,12 @@ SndFileImportableSource::get_timecode_info (SNDFILE* sf, SF_BROADCAST_INFO* binf
SndFileImportableSource::SndFileImportableSource (const string& path)
{
int fd = g_open (path.c_str (), SFM_READ, 0444);
if (fd == -1) {
throw failed_constructor ();
}
memset(&sf_info, 0 , sizeof(sf_info));
in.reset( sf_open(Glib::locale_from_utf8(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;