Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/src/3rdparty/phonon/mmf/abstractmediaplayer.h

    r769 r846  
    2424#include <e32std.h>
    2525#include "abstractplayer.h"
     26#ifdef PHONON_MMF_PROGRESSIVE_DOWNLOAD
     27#   include "download.h"
     28#endif
    2629
    2730class RFile;
     
    4851
    4952public:
    50     virtual void open(const Phonon::MediaSource&, RFile&);
     53    virtual void open();
     54    virtual void close();
    5155
    5256    // MediaObjectInterface
     
    5660    virtual void seek(qint64 milliseconds);
    5761    virtual bool isSeekable() const;
     62    virtual qint64 currentTime() const;
    5863    virtual void volumeChanged(qreal volume);
    5964
     
    6974    virtual void doSeek(qint64 pos) = 0;
    7075    virtual int setDeviceVolume(int mmfVolume) = 0;
     76    virtual int openFile(const QString &fileName) = 0;
    7177    virtual int openFile(RFile& file) = 0;
    72     virtual int openUrl(const QString& url) = 0;
     78    virtual int openUrl(const QString& url, int iap) = 0;
     79    virtual int openDescriptor(const TDesC8 &des) = 0;
    7380    virtual int bufferStatus() const = 0;
    74     virtual void close() = 0;
     81    virtual void doClose() = 0;
    7582
    7683    void updateMetaData();
     84    virtual qint64 getCurrentTime() const = 0;
    7785    virtual int numberOfMetaDataEntries() const = 0;
    7886    virtual QPair<QString, QString> metaDataEntry(int index) const = 0;
     
    8795    static qint64 toMilliSeconds(const TTimeIntervalMicroSeconds &);
    8896
     97    bool isProgressiveDownload() const;
     98    bool progressiveDownloadStalled() const;
     99
    89100private:
    90101    void startPositionTimer();
     
    97108    void resetMarksIfRewound();
    98109    void startPlayback();
     110    void setProgressiveDownloadStalled();
    99111
    100112    enum Pending {
     
    109121    void positionTick();
    110122    void bufferStatusTick();
     123#ifdef PHONON_MMF_PROGRESSIVE_DOWNLOAD
     124    void downloadLengthChanged(qint64);
     125    void downloadStateChanged(Download::State);
     126#endif
    111127
    112128private:
     
    116132
    117133    QScopedPointer<QTimer>      m_positionTimer;
     134    qint64                      m_position;
    118135
    119136    QScopedPointer<QTimer>      m_bufferStatusTimer;
     
    124141    bool                        m_prefinishMarkSent;
    125142    bool                        m_aboutToFinishSent;
     143
     144    // Used for playback of resource files
     145    TPtrC8                      m_buffer;
     146
     147#ifdef PHONON_MMF_PROGRESSIVE_DOWNLOAD
     148    Download                    *m_download;
     149    bool                        m_downloadStalled;
     150#endif
    126151
    127152    QMultiMap<QString, QString> m_metaData;
Note: See TracChangeset for help on using the changeset viewer.