Changeset 769 for trunk/src/3rdparty/phonon/mmf/mediaobject.h

Timestamp:

Aug 2, 2010, 9:27:30 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.3 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

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

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

@@ -39 +39 @@
 {
 class AbstractPlayer;
-class VideoOutput;
+class AbstractVideoOutput;
 
 /**
@@ -86 +86 @@
     AbstractPlayer *abstractPlayer() const;
 
-    void setVideoOutput(VideoOutput* videoOutput);
+    void setVideoOutput(AbstractVideoOutput* videoOutput);
 
 public Q_SLOTS:
@@ -107 +107 @@
     void finished();
     void tick(qint64 time);
+
+private Q_SLOTS:
+    void handlePrefinishMarkReached(qint32);
 
 private: