--- a/qtmobility/plugins/multimedia/directshow/player/directshowplayerservice.h Fri Apr 16 15:51:22 2010 +0300
+++ b/qtmobility/plugins/multimedia/directshow/player/directshowplayerservice.h Mon May 03 13:18:40 2010 +0300
@@ -42,10 +42,10 @@
#ifndef DIRECTSHOWPLAYERSERVICE_H
#define DIRECTSHOWPLAYERSERVICE_H
-#include <qmediaplayer.h>
-#include <qmediaresource.h>
-#include <qmediaservice.h>
-#include <qmediatimerange.h>
+#include "../../src/multimedia/qmediaplayer.h"
+#include "../../src/multimedia/qmediaresource.h"
+#include "../../src/multimedia/qmediaservice.h"
+#include "../../src/multimedia/qmediatimerange.h"
#include "directshoweventloop.h"
#include "directshowglobal.h"
@@ -113,6 +113,7 @@
int findStreamType(IPin *pin) const;
bool isConnected(IBaseFilter *filter, PIN_DIRECTION direction) const;
+ IBaseFilter *getConnected(IBaseFilter *filter, PIN_DIRECTION direction) const;
void run();
@@ -124,6 +125,7 @@
void doSeek(QMutexLocker *locker);
void doPlay(QMutexLocker *locker);
void doPause(QMutexLocker *locker);
+ void doStop(QMutexLocker *locker);
void doReleaseAudioOutput(QMutexLocker *locker);
void doReleaseVideoOutput(QMutexLocker *locker);
void doReleaseGraph(QMutexLocker *locker);
@@ -161,7 +163,8 @@
Paused,
DurationChange,
StatusChange,
- EndOfMedia
+ EndOfMedia,
+ PositionChange
};
enum GraphStatus
@@ -180,6 +183,7 @@
DirectShowAudioEndpointControl *m_audioEndpointControl;
QThread *m_taskThread;
+ DirectShowEventLoop *m_loop;
int m_pendingTasks;
int m_executingTask;
int m_executedTasks;
@@ -202,8 +206,8 @@
QMediaTimeRange m_playbackRange;
QUrl m_url;
QMediaResourceList m_resources;
+ QString m_errorString;
QMutex m_mutex;
- DirectShowEventLoop m_loop;
friend class DirectShowPlayerServiceThread;
};