From 87b89a605f0c4e5fcabf9061d1a13c9caa65a824 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Thu, 16 Jul 2015 19:29:45 +0200 Subject: Revert "Possible fix for http://tracker.ardour.org/view.php?id=6332" This reverts commit 1a619472ca0d7514831476bb9be9980ffbd91f46. On Unix systems "#define g_open open" interferes with class member function IMHO this is the wrong approach, the filename should be converted using glib::filename_from_utf8(). --- libs/ardour/sndfileimportable.cc | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'libs/ardour/sndfileimportable.cc') diff --git a/libs/ardour/sndfileimportable.cc b/libs/ardour/sndfileimportable.cc index ffc894b2d4..5ccab2c0d2 100644 --- a/libs/ardour/sndfileimportable.cc +++ b/libs/ardour/sndfileimportable.cc @@ -24,9 +24,6 @@ #include "pbd/error.h" #include "ardour/sndfileimportable.h" -#include -#include - using namespace ARDOUR; using namespace std; @@ -70,12 +67,8 @@ 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_fd(fd, SFM_READ, &sf_info, true), sf_close); + in.reset( sf_open(path.c_str(), SFM_READ, &sf_info), sf_close); if (!in) throw failed_constructor(); SF_BROADCAST_INFO binfo; -- cgit v1.2.3