diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-11-19 13:53:04 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-11-19 13:53:04 (GMT) |
| commit | 4e53466f63bf05e90a69f80fda8580dabc1e9ed0 (patch) | |
| tree | 0978f427af78291d8dd16004cc4ca33dbe1af433 /src/3rdparty/phonon/mmf/abstractmediaplayer.h | |
| parent | 5bd71902f97ba75dc93ccf709dbfdd2ffeb361b2 (diff) | |
| parent | fbbdf8698fb0444d5170b7d0a14e870ea789398f (diff) | |
| download | Qt-4e53466f63bf05e90a69f80fda8580dabc1e9ed0.zip Qt-4e53466f63bf05e90a69f80fda8580dabc1e9ed0.tar.gz Qt-4e53466f63bf05e90a69f80fda8580dabc1e9ed0.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 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: |