From 072a3065cd05f7e7b2f9b5c41e13628d4faaee3c Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Thu, 15 Nov 2018 20:20:30 +0100 Subject: [PATCH] Don't set paths for gst scanner and plugins on macos --- src/engine/gstengine.cpp | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/src/engine/gstengine.cpp b/src/engine/gstengine.cpp index f029a29e4..a7d8887ec 100644 --- a/src/engine/gstengine.cpp +++ b/src/engine/gstengine.cpp @@ -436,13 +436,7 @@ void GstEngine::SetEnvironment() { QString plugin_path; QString registry_filename; - // On windows and mac 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 + // On windows we bundle the gstreamer plugins with strawberry #if defined(Q_OS_WIN32) plugin_path = QDir::toNativeSeparators(QCoreApplication::applicationDirPath() + "/gstreamer-plugins"); #endif @@ -463,10 +457,6 @@ void GstEngine::SetEnvironment() { 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"); }