Phonon: synchronise with KDE HEAD, part 1

diff --git a/bindings/phonon/vlc/backend.h b/bindings/phonon/vlc/backend.h
index 4cb5c91c4fa5ebc60b1ef0f3be5e960dff415b43..00dfe94d2769a0bf39b836a7a9c0ea986d4f253c 100644 (file)
--- a/bindings/phonon/vlc/backend.h
+++ b/bindings/phonon/vlc/backend.h
@@ -32,12 +32,6 @@
 #include <QtCore/QPointer>
 #include <QtCore/QStringList>
 
-#ifdef MAKE_PHONON_VLC_LIB // We are building this library
-# define PHONON_VLC_EXPORT Q_DECL_EXPORT
-#else // We are using this library
-# define PHONON_VLC_EXPORT Q_DECL_IMPORT
-#endif
-
 namespace Phonon
 {
 namespace VLC {

diff --git a/bindings/phonon/vlc/mediaobject.cpp b/bindings/phonon/vlc/mediaobject.cpp
index aad5103e42b918402962f6e0d896a7057e323728..9e5ccd52ca92b73a81f6bd872a691f893feae69a 100644 (file)
--- a/bindings/phonon/vlc/mediaobject.cpp
+++ b/bindings/phonon/vlc/mediaobject.cpp
@@ -61,7 +61,7 @@ MediaObject::~MediaObject()
 {
 }
 
-void MediaObject::setVideoWidgetId(int i_widget_id)
+void MediaObject::setVideoWidgetId(WId i_widget_id)
 {
     i_video_widget_id = i_widget_id;
 }

diff --git a/bindings/phonon/vlc/mediaobject.h b/bindings/phonon/vlc/mediaobject.h
index 01fdc6f95cd9fabcffa76a7b9b51274e7a79040c..23eca49bf832ddc2f615a236f03ee8854a9902a6 100644 (file)
--- a/bindings/phonon/vlc/mediaobject.h
+++ b/bindings/phonon/vlc/mediaobject.h
@@ -25,6 +25,7 @@
 #include <phonon/mediaobjectinterface.h>
 
 #include <QtCore/QObject>
+#include <QtGui/QWidget>
 
 namespace Phonon
 {
@@ -45,7 +46,7 @@ public:
     /**
      * Widget Id where VLC will show the videos.
      */
-    void setVideoWidgetId(int i_widget_id);
+    void setVideoWidgetId(WId i_widget_id);
 
     void play();
     void seek(qint64 milliseconds);
@@ -69,8 +70,8 @@ public:
 signals:
 
     void aboutToFinish();
-//    void bufferStatus( int i_percent_filled );
-//    void currentSourceChanged( const MediaSource & newSource );
+    void bufferStatus( int i_percent_filled );
+    void currentSourceChanged( const MediaSource & newSource );
     void finished();
     void hasVideoChanged(bool b_has_video);
     void metaDataChanged(const QMultiMap<QString, QString> & metaData);
@@ -93,7 +94,7 @@ protected:
 
     virtual qint64 currentTimeInternal() const = 0;
 
-    int i_video_widget_id;
+    WId i_video_widget_id;
 
 private slots:
 

diff --git a/bindings/phonon/vlc/videowidget.cpp b/bindings/phonon/vlc/videowidget.cpp
index 2afef533f3d3834a51fa822f4eb350e5d88621fd..8902112b8d16e938c9871844349cf1666d134d89 100644 (file)
--- a/bindings/phonon/vlc/videowidget.cpp
+++ b/bindings/phonon/vlc/videowidget.cpp
@@ -61,7 +61,7 @@ void VideoWidget::connectToMediaObject(PrivateMediaObject *mediaObject)
     connect(mediaObject, SIGNAL(videoWidgetSizeChanged(int, int)),
             SLOT(videoWidgetSizeChanged(int, int)));
 
-    mediaObject->setVideoWidgetId((int) p_video_widget->winId());
+    mediaObject->setVideoWidgetId(p_video_widget->winId());
 }
 
 Phonon::VideoWidget::AspectRatio VideoWidget::aspectRatio() const

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();