Phonon: synchronise with KDE HEAD, part 1

[vlc] / bindings / phonon / vlc / vlcloader.cpp

diff --git a/bindings/phonon/vlc/vlcloader.cpp b/bindings/phonon/vlc/vlcloader.cpp
index 73e42da2dfb921d1e7bfb400f9f00e34cb36bc17..9350d6967afa1214dcb2dfbfa706c43085e09785 100644 (file)
--- a/bindings/phonon/vlc/vlcloader.cpp
+++ b/bindings/phonon/vlc/vlcloader.cpp
@@ -45,16 +45,18 @@ bool vlcInit()
 
     QString path = vlcPath();
     if (!path.isEmpty()) {
-        QString pluginsPath = path;
+        QString pluginsPath = QString("--plugin-path=") + QDir::toNativeSeparators(QFileInfo(vlcPath()).dir().path());
 #if defined(Q_OS_UNIX)
         pluginsPath.append("/vlc");
 #elif defined(Q_OS_WIN)
         pluginsPath.append("\\plugins");
 #endif
+        QByteArray p = path.toLatin1();
+        QByteArray pp = pluginsPath.toLatin1();
         // VLC command line options. See vlc --full-help
         const char *vlcArgs[] = {
-            path.toLatin1().constData(),
-            "--plugin-path=", pluginsPath.toAscii().constData(),
+            p.constData(),
+            pp.constData(),
             "--verbose=2",
             "--intf=dummy",
             "--extraintf=logger",
@@ -157,7 +159,7 @@ static QStringList findAllLibVlc()
     QString vlcVersion = settings.value("Version").toString();
     QString vlcInstallDir = settings.value("InstallDir").toString();
     if (vlcVersion.startsWith("1.0") && !vlcInstallDir.isEmpty()) {
-        paths << vlcInstallDir + QLatin1Char('\\') + "libvlc";
+        paths << vlcInstallDir + QLatin1Char('\\') + "libvlc.dll";
         return paths;
     } else {
         return QString();