#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 {
{
}
-void MediaObject::setVideoWidgetId(int i_widget_id)
+void MediaObject::setVideoWidgetId(WId i_widget_id)
{
i_video_widget_id = i_widget_id;
}
#include <phonon/mediaobjectinterface.h>
#include <QtCore/QObject>
+#include <QtGui/QWidget>
namespace Phonon
{
/**
* 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);
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);
virtual qint64 currentTimeInternal() const = 0;
- int i_video_widget_id;
+ WId i_video_widget_id;
private slots:
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
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",
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();