Funkwhale
/
Clementine-audio-player-Mac-Linux-Windows
mirror of https://github.com/clementine-player/Clementine
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix setenv/putenv madness on mac

This commit is contained in:
David Sansome 2010-04-22 13:49:16 +00:00
parent f8196d8d47
commit 82602f8d96
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/engines/gstengine.cpp
View File

@ -70,11 +70,19 @@ GstEngine::~GstEngine() {
gst_deinit();
}
void GstEngine::SetEnv(const char *key, const QString &value) {
#ifdef Q_OS_WIN32
putenv(QString("%1=%2").arg(key, value).toLocal8Bit().constData());
#else
setenv(key, value.toLocal8Bit().constData(), 1);
#endif
}
bool GstEngine::Init() {
QString scanner_path;
QString plugin_path;
// On windows and mac we bundle the gstreamer plugins with clementine
#if defined(Q_OS_DARWIN)
scanner_path = QCoreApplication::applicationDirPath() + "/../PlugIns/gst-plugin-scanner";
plugin_path = QCoreApplication::applicationDirPath() + "/../PlugIns/gstreamer";
@ -82,15 +90,12 @@ bool GstEngine::Init() {
plugin_path = QCoreApplication::applicationDirPath() + "/gstreamer-plugins";
#endif
// Use putenv instead of setenv because windows doesn't have setenv.
// Use data() instead of constData() because linux's putenv takes non-const char*.
// :-(
if (!scanner_path.isEmpty())
putenv(QString("GST_PLUGIN_SCANNER=%1").arg(scanner_path).toAscii().data());
SetEnv("GST_PLUGIN_SCANNER", scanner_path);
if (!plugin_path.isEmpty()) {
putenv(QString("GST_PLUGIN_PATH=%1").arg(plugin_path).toAscii().data());
SetEnv("GST_PLUGIN_PATH", plugin_path);
// Never load plugins from anywhere else.
putenv(QString("GST_PLUGIN_SYSTEM_PATH=%1").arg(plugin_path).toAscii().data());
SetEnv("GST_PLUGIN_SYSTEM_PATH", plugin_path);
}
// GStreamer initialization

1
src/engines/gstengine.h
View File

@ -111,6 +111,7 @@ class GstEngine : public Engine::Base {
static gboolean CanDecodeBusCallback(GstBus*, GstMessage*, gpointer);
static void PrintGstError(GstMessage* msg);
static void SetEnv(const char* key, const QString& value);
PluginDetailsList GetPluginList(const QString& classname) const;
void StartFadeout();