summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/phonon/ds9/mediaobject.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/3rdparty/phonon/ds9/mediaobject.h')
-rw-r--r--src/3rdparty/phonon/ds9/mediaobject.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/3rdparty/phonon/ds9/mediaobject.h b/src/3rdparty/phonon/ds9/mediaobject.h
index 34aa666..2c34ffc 100644
--- a/src/3rdparty/phonon/ds9/mediaobject.h
+++ b/src/3rdparty/phonon/ds9/mediaobject.h
@@ -114,7 +114,6 @@ namespace Phonon
enum Task
{
- None,
Render,
Seek,
ChangeState,
@@ -123,7 +122,6 @@ namespace Phonon
struct Work
{
- Work() : task(None), id(0), time(0) { }
Task task;
quint16 id;
Graph graph;
@@ -137,14 +135,16 @@ namespace Phonon
};
QList<Filter> decoders; //for the state change requests
};
+ Work dequeueWork();
void handleTask();
- Work m_currentWork;
+ Graph m_currentRender;
+ qint16 m_currentRenderId;
QQueue<Work> m_queue;
bool m_finished;
quint16 m_currentWorkId;
QWinWaitCondition m_waitCondition;
- QMutex m_mutex; // mutex for the m_queue, m_finished and m_currentWorkId
+ QMutex m_mutex;
//this is for WaitForMultipleObjects
struct