dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't set paths for gst scanner and plugins on macos

Browse Source
This commit is contained in:
Jonas Kvinge
2018-11-15 20:20:30 +01:00
parent 718bd4c081
commit 072a3065cd
1 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/engine/gstengine.cpp
View File

@@ -436,13 +436,7 @@ void GstEngine::SetEnvironment() {
QString plugin_path; QString plugin_path;
QString registry_filename; QString registry_filename;
// On windows and mac we bundle the gstreamer plugins with strawberry // On windows we bundle the gstreamer plugins with strawberry
#if defined(Q_OS_MACOS)
//scanner_path = QCoreApplication::applicationDirPath() + "/../PlugIns/gst-plugin-scanner";
//plugin_path = QCoreApplication::applicationDirPath() + "/../PlugIns/gstreamer";
scanner_path = "/usr/local/Cellar/gstreamer/1.14.1/libexec/gstreamer-1.0/gst-plugin-scanner";
plugin_path = "/usr/local/lib/gstreamer-1.0";
#endif
#if defined(Q_OS_WIN32) #if defined(Q_OS_WIN32)
plugin_path = QDir::toNativeSeparators(QCoreApplication::applicationDirPath() + "/gstreamer-plugins"); plugin_path = QDir::toNativeSeparators(QCoreApplication::applicationDirPath() + "/gstreamer-plugins");
#endif #endif
@@ -463,10 +457,6 @@ void GstEngine::SetEnvironment() {
Utilities::SetEnv("GST_REGISTRY", registry_filename); Utilities::SetEnv("GST_REGISTRY", registry_filename);
} }
//#ifdef Q_OS_MACOS
//Utilities::SetEnv("GIO_EXTRA_MODULES", QCoreApplication::applicationDirPath() + "/../PlugIns/gio-modules");
//#endif
Utilities::SetEnv("PULSE_PROP_media.role", "music"); Utilities::SetEnv("PULSE_PROP_media.role", "music");
} }