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

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

Browse Source 
This reverts commit 1a619472ca.

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().
This commit is contained in:
Robin Gareus
2015-07-16 19:29:45 +02:00
parent 1a619472ca
commit 87b89a605f
3 changed files with 8 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gtk2_ardour/sfdb_ui.cc
View File

@@ -29,6 +29,7 @@
#include <unistd.h> #include <unistd.h>
#include <limits.h> #include <limits.h>
#include <sys/stat.h>
#include <gtkmm/box.h> #include <gtkmm/box.h>
#include <gtkmm/stock.h> #include <gtkmm/stock.h>
@@ -1254,8 +1255,8 @@ SoundFileBrowser::get_paths ()
vector<string>::iterator i; vector<string>::iterator i;
for (i = filenames.begin(); i != filenames.end(); ++i) { for (i = filenames.begin(); i != filenames.end(); ++i) {
GStatBuf buf; struct stat buf;
if ((!g_stat((*i).c_str(), &buf)) && S_ISREG(buf.st_mode)) { if ((!stat((*i).c_str(), &buf)) && S_ISREG(buf.st_mode)) {
results.push_back (*i); results.push_back (*i);
} }
} }
@@ -1589,7 +1590,7 @@ SoundFileOmega::check_link_status (const Session* s, const vector<string>& paths
std::string tmpdir(Glib::build_filename (s->session_directory().sound_path(), "linktest")); std::string tmpdir(Glib::build_filename (s->session_directory().sound_path(), "linktest"));
bool ret = false; bool ret = false;
if (g_mkdir (tmpdir.c_str(), 0744)) { if (mkdir (tmpdir.c_str(), 0744)) {
if (errno != EEXIST) { if (errno != EEXIST) {
return false; return false;
} }
@@ -1613,7 +1614,7 @@ SoundFileOmega::check_link_status (const Session* s, const vector<string>& paths
ret = true; ret = true;
out: out:
g_rmdir (tmpdir.c_str()); rmdir (tmpdir.c_str());
return ret; return ret;
#endif #endif
} }

9
libs/ardour/sndfileimportable.cc
View File

@@ -24,9 +24,6 @@
#include "pbd/error.h" #include "pbd/error.h"
#include "ardour/sndfileimportable.h" #include "ardour/sndfileimportable.h"
#include <fcntl.h>
#include <glib/gstdio.h>
using namespace ARDOUR; using namespace ARDOUR;
using namespace std; using namespace std;
@@ -70,12 +67,8 @@ SndFileImportableSource::get_timecode_info (SNDFILE* sf, SF_BROADCAST_INFO* binf
SndFileImportableSource::SndFileImportableSource (const string& path) 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)); 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(); if (!in) throw failed_constructor();
SF_BROADCAST_INFO binfo; SF_BROADCAST_INFO binfo;

14
libs/ardour/sndfilesource.cc
View File

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