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

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

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

Location:

trunk

Files:

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

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

@@ -24 +24 @@
 #include <QScopedPointer>
 #include <QTimer>
+#include <QString>
 
 // For recognizer
@@ -33 +34 @@
 
 QT_BEGIN_NAMESPACE
+
+class QResource;
 
 namespace Phonon
@@ -88 +91 @@
     void setVideoOutput(AbstractVideoOutput* videoOutput);
 
+    int openFileHandle(const QString &fileName);
+    RFile* file() const;
+    QResource* resource() const;
+    int currentIAP() const;
+
 public Q_SLOTS:
     void volumeChanged(qreal volume);
@@ -108 +116 @@
     void tick(qint64 time);
 
+protected:
+    bool eventFilter(QObject *watched, QEvent *event);
+
 private Q_SLOTS:
     void handlePrefinishMarkReached(qint32);
@@ -115 +126 @@
     void createPlayer(const MediaSource &source);
     bool openRecognizer();
+    void setIAPIdFromNameL(const QString& iapString);
 
     // Audio / video media type recognition
     MediaType fileMediaType(const QString& fileName);
+    MediaType bufferMediaType(const uchar *data, qint64 size);
     // TODO: urlMediaType function
 
@@ -133 +146 @@
     bool                                m_nextSourceSet;
 
-    // Storing the file handle here to work around KErrInUse error
-    // from MMF player utility OpenFileL functions
-    RFile                               m_file;
+    RFile*                              m_file;
+    QResource*                          m_resource;
 
     QScopedPointer<AbstractPlayer>      m_player;
+    int                                 m_iap;
 
 };