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().
#include <unistd.h>
#include <limits.h>
+#include <sys/stat.h>
#include <gtkmm/box.h>
#include <gtkmm/stock.h>
vector<string>::iterator i;
for (i = filenames.begin(); i != filenames.end(); ++i) {
- GStatBuf buf;
- if ((!g_stat((*i).c_str(), &buf)) && S_ISREG(buf.st_mode)) {
+ struct stat buf;
+ if ((!stat((*i).c_str(), &buf)) && S_ISREG(buf.st_mode)) {
results.push_back (*i);
}
}
std::string tmpdir(Glib::build_filename (s->session_directory().sound_path(), "linktest"));
bool ret = false;
- if (g_mkdir (tmpdir.c_str(), 0744)) {
+ if (mkdir (tmpdir.c_str(), 0744)) {
if (errno != EEXIST) {
return false;
}
ret = true;
out:
- g_rmdir (tmpdir.c_str());
+ rmdir (tmpdir.c_str());
return ret;
#endif
}
#include "pbd/error.h"
#include "ardour/sndfileimportable.h"
-#include <fcntl.h>
-#include <glib/gstdio.h>
-
using namespace ARDOUR;
using namespace std;
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;
#include <sys/stat.h>
-#include <glib/gstdio.h>
-
#ifdef PLATFORM_WINDOWS
#include <glibmm/convert.h>
#endif
#include "ardour/utils.h"
#include "ardour/session.h"
-#include <fcntl.h>
-
#include "i18n.h"
using namespace std;
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 ((-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) {
+ if ((sf = sf_open (const_cast<char*>(path.c_str()), SFM_READ, &sf_info)) == 0) {
+ char errbuf[256];
error_msg = sf_error_str (0, errbuf, sizeof (errbuf) - 1);
return false;
}