diff options
| author | Gareth Stockwell <gareth.stockwell@sosco.com> | 2009-08-20 11:24:03 (GMT) |
|---|---|---|
| committer | Gareth Stockwell <gareth.stockwell@sosco.com> | 2009-08-20 11:24:03 (GMT) |
| commit | f695026fce1c20fdf4ca101dd7ac8da291ecf381 (patch) | |
| tree | 0c91366ad6e53ecf0cf985aa3e98ff1fdab433be /src/3rdparty/phonon/mmf/abstractmediaplayer.h | |
| parent | 991fb666cd7ba1d543156980bdc601309ec2c434 (diff) | |
| download | Qt-f695026fce1c20fdf4ca101dd7ac8da291ecf381.zip Qt-f695026fce1c20fdf4ca101dd7ac8da291ecf381.tar.gz Qt-f695026fce1c20fdf4ca101dd7ac8da291ecf381.tar.bz2 | |
Added VolumeControlInterface to abstract details of path between MediaObject and AudioOutput
Diffstat (limited to 'src/3rdparty/phonon/mmf/abstractmediaplayer.h')
| -rw-r--r-- | src/3rdparty/phonon/mmf/abstractmediaplayer.h | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/src/3rdparty/phonon/mmf/abstractmediaplayer.h b/src/3rdparty/phonon/mmf/abstractmediaplayer.h index 9f86ee6..2f95e73 100644 --- a/src/3rdparty/phonon/mmf/abstractmediaplayer.h +++ b/src/3rdparty/phonon/mmf/abstractmediaplayer.h @@ -32,6 +32,10 @@ namespace Phonon { class AudioOutput; + /** + * Interface via which MMF client APIs for both audio and video can be + * accessed. + */ class AbstractMediaPlayer : public AbstractPlayer { Q_OBJECT @@ -41,7 +45,7 @@ namespace Phonon ~AbstractMediaPlayer(); public: - // AbstractPlayer + // MediaObjectInterface virtual void play(); virtual void pause(); virtual void stop(); @@ -56,18 +60,12 @@ namespace Phonon virtual qint32 transitionTime() const; virtual void setTransitionTime(qint32); virtual MediaSource source() const; + virtual void setFileSource(const Phonon::MediaSource&, RFile&); virtual void setNextSource(const MediaSource &source); - - // This is a temporary hack to work around KErrInUse from MMF - // client utility OpenFileL calls - //virtual void setSource(const Phonon::MediaSource &) = 0; - virtual void setFileSource - (const Phonon::MediaSource&, RFile&); - + + // VolumeControlInterface qreal volume() const; - bool setVolume(qreal volume); - - void setAudioOutput(AudioOutput* audioOutput); + bool setVolume(qreal volume); protected: virtual void doPlay() = 0; @@ -80,7 +78,7 @@ namespace Phonon protected: void startTickTimer(); void stopTickTimer(); - void initVolume(int initialVolume, int maxVolume); + void initVolume(int maxVolume); /** * Defined private state enumeration in order to add GroundState @@ -138,9 +136,6 @@ namespace Phonon qreal m_volume; int m_mmfMaxVolume; - // Not owned - AudioOutput* m_audioOutput; - MediaSource m_source; MediaSource m_nextSource; |