diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2009-10-19 11:59:46 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-10-19 11:59:46 (GMT) |
| commit | 4d1c2703874b02872a1b54b49dff4140a19d6ed4 (patch) | |
| tree | b3f1e9d3cccd0dc67769da31a7b5509c7cb02733 /src/3rdparty/phonon/mmf/abstractplayer.h | |
| parent | 226d67e9077b908a128521a6bb763cf412fbe87e (diff) | |
| parent | f16fc0150fce1d78cc71c27c163baf45e8953aca (diff) | |
| download | Qt-4d1c2703874b02872a1b54b49dff4140a19d6ed4.zip Qt-4d1c2703874b02872a1b54b49dff4140a19d6ed4.tar.gz Qt-4d1c2703874b02872a1b54b49dff4140a19d6ed4.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/3rdparty/phonon/mmf/abstractplayer.h')
| -rw-r--r-- | src/3rdparty/phonon/mmf/abstractplayer.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/3rdparty/phonon/mmf/abstractplayer.h b/src/3rdparty/phonon/mmf/abstractplayer.h index ec39ab1..08558cf 100644 --- a/src/3rdparty/phonon/mmf/abstractplayer.h +++ b/src/3rdparty/phonon/mmf/abstractplayer.h @@ -87,7 +87,7 @@ public: // VolumeObserver virtual void volumeChanged(qreal volume); - + void setVideoOutput(VideoOutput* videoOutput); /** @@ -146,9 +146,9 @@ private: protected: // Not owned VideoOutput* m_videoOutput; - + qreal m_volume; - + private: PrivateState m_state; Phonon::ErrorType m_error; |