Changeset 561 for trunk/src/3rdparty/phonon/ds9/mediaobject.h

Timestamp:

Feb 11, 2010, 11:19:06 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/3rdparty/phonon/ds9/mediaobject.h (modified) (3 diffs)

trunk/src/3rdparty/phonon/ds9/mediaobject.h

@@ -115 +115 @@
             enum Task
             {
+
                 Render,
                 Seek,
@@ -123 +124 @@
             struct Work
             {
+
                 Task task;
                 quint16 id;
@@ -136 +138 @@
                 QList<Filter> decoders; //for the state change requests
             };
-            Work dequeueWork();
             void handleTask();
 
-            Graph m_currentRender;
-                        qint16 m_currentRenderId;
+            Work m_currentWork;
             QQueue<Work> m_queue;
             bool m_finished;
             quint16 m_currentWorkId;
             QWinWaitCondition m_waitCondition;
-            QMutex m_mutex;
+            QMutex m_mutex;
 
             //this is for WaitForMultipleObjects