diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-11-18 12:39:40 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-11-18 12:39:40 (GMT) |
| commit | d46da3a141ad05c9f7cd7ea94e254980748329da (patch) | |
| tree | 72beadfabcf66d725b10bbc5ce3d8c38137ed888 /src/3rdparty/phonon/mmf/abstractmediaplayer.h | |
| parent | 62e641691b9a3eadc8b9fb2e31150cdf5b66115d (diff) | |
| parent | 6f6b2ab07c0dbd0ebdb25f1fbe537ea12bdffee4 (diff) | |
| download | Qt-d46da3a141ad05c9f7cd7ea94e254980748329da.zip Qt-d46da3a141ad05c9f7cd7ea94e254980748329da.tar.gz Qt-d46da3a141ad05c9f7cd7ea94e254980748329da.tar.bz2 | |
Merge remote branch 'mainline/4.6' into 4.6
Diffstat (limited to 'src/3rdparty/phonon/mmf/abstractmediaplayer.h')
| -rw-r--r-- | src/3rdparty/phonon/mmf/abstractmediaplayer.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/3rdparty/phonon/mmf/abstractmediaplayer.h b/src/3rdparty/phonon/mmf/abstractmediaplayer.h index cff7bab..cb6e437 100644 --- a/src/3rdparty/phonon/mmf/abstractmediaplayer.h +++ b/src/3rdparty/phonon/mmf/abstractmediaplayer.h @@ -56,8 +56,6 @@ public: virtual MediaSource source() const; virtual void setFileSource(const Phonon::MediaSource&, RFile&); virtual void setNextSource(const MediaSource &source); - - // VolumeObserver virtual void volumeChanged(qreal volume); protected: |