[vlmc-devel] EffectsEngine: Search for effects on MacOSx too
Hugo Beauzée-Luyssen
git at videolan.org
Fri Mar 25 11:31:39 CET 2011
vlmc | branch: master | Hugo Beauzée-Luyssen <beauze.h at gmail.com> | Fri Mar 25 11:30:29 2011 +0100| [864fdf72fbd02da8b5672248cd8369dde874e527] | committer: Hugo Beauzée-Luyssen
EffectsEngine: Search for effects on MacOSx too
> http://git.videolan.org/gitweb.cgi/vlmc.git/?a=commit;h=864fdf72fbd02da8b5672248cd8369dde874e527
---
src/EffectsEngine/EffectsEngine.cpp | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/EffectsEngine/EffectsEngine.cpp b/src/EffectsEngine/EffectsEngine.cpp
index bac9af3..8f40bc0 100644
--- a/src/EffectsEngine/EffectsEngine.cpp
+++ b/src/EffectsEngine/EffectsEngine.cpp
@@ -138,9 +138,10 @@ EffectsEngine::loadEffects()
QString("/usr/local/lib/frei0r-1/") <<
QString("/usr/lib/frei0r-1/" );
}
-#elif defined ( Q_OS_WIN32 )
+#else
/* Search in the application folder */
pathList << qApp->applicationDirPath() + "/effects/";
+# if defined ( Q_OS_WIN32 )
TCHAR appDir[128];
if ( GetModuleFileName( NULL, appDir, 128 ) > 0 )
{
@@ -158,6 +159,7 @@ EffectsEngine::loadEffects()
qWarning() << "Failed to get application directory. Using current path.";
pathList << QDir::currentPath() + "/effects/";
}
+# endif
#endif
qDebug() << "Loading effects from:" << pathList;
foreach ( const QString &path, pathList )
More information about the Vlmc-devel
mailing list