Last active
December 10, 2015 04:18
-
-
Save muesli/4380358 to your computer and use it in GitHub Desktop.
phononvlc-check-bundle-patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/utils/libvlc.cpp b/src/utils/libvlc.cpp | |
index 69d626e..e4ee996 100644 | |
--- a/src/utils/libvlc.cpp | |
+++ b/src/utils/libvlc.cpp | |
@@ -107,19 +107,19 @@ bool LibVLC::init() | |
// appropriate output should be loaded. This is to prevent cases where | |
// one has only an AudioOutput but plays a video, in which case libvlc | |
// would open a separate window for the video. | |
- args << "--vout=vdummy"; | |
- args << "--aout=adummy"; | |
+// args << "--vout=vdummy"; | |
+// args << "--aout=adummy"; | |
// Do not preload services discovery modules, we don't use them. | |
args << "--services-discovery=''"; | |
// Allow multiple starts (one gets to wonder whether that makes a difference. | |
+#ifndef Q_OS_MAC | |
args << "--no-one-instance"; | |
// This causes leaky abstraction. VLC by default will create a default vout/aout | |
// when none was defined/requested. i.e. when you have a VideoWidget but | |
// no AudioOutput you will still get audio if there is an audio stream, | |
// equally if you have only an AudioOutput and play a video VLC will pop | |
// up a Video window. | |
- args << "--aout=dummy"; | |
- args << "--vout=dummy"; | |
+#endif | |
// Build const char* array | |
QVarLengthArray<const char *, 64> vlcArgs(args.size()); | |
@@ -192,6 +192,7 @@ QStringList LibVLC::findAllLibVlcPaths() | |
paths << QCoreApplication::applicationDirPath() | |
<< QCoreApplication::applicationDirPath() % QLatin1Literal("/../Frameworks") | |
<< QCoreApplication::applicationDirPath() % QLatin1Literal("/../PlugIns") | |
+ << QCoreApplication::applicationDirPath() % QLatin1Literal("/../plugins") | |
<< QCoreApplication::applicationDirPath() % QLatin1Literal("/lib"); | |
#endif | |
paths << QString::fromLatin1(qgetenv("LD_LIBRARY_PATH")) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment