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

Timestamp:

Mar 8, 2010, 12:52:58 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.2 sources.

Location:

trunk

Files:

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

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

@@ -20 +20 @@
 #define PHONON_MMF_MEDIAOBJECT_H
 
-#include <Phonon/mediasource.h>
-#include <Phonon/mediaobjectinterface.h>
+#include <phonon/mediasource.h>
+#include <phonon/mediaobjectinterface.h>
 #include <QScopedPointer>
 #include <QTimer>
@@ -93 +93 @@
 
 Q_SIGNALS:
+    void abstractPlayerChanged(AbstractPlayer *player);
     void totalTimeChanged(qint64 length);
     void hasVideoChanged(bool hasVideo);
@@ -102 +103 @@
     void metaDataChanged(const QMultiMap<QString, QString>& metaData);
     void currentSourceChanged(const MediaSource& source);
-    void stateChanged(Phonon::State oldState,
-                      Phonon::State newState);
+    void stateChanged(Phonon::State newState,
+                      Phonon::State oldState);
     void finished();
     void tick(qint64 time);