diff options
| author | Bill King <bill.king@nokia.com> | 2009-11-18 22:32:16 (GMT) |
|---|---|---|
| committer | Bill King <bill.king@nokia.com> | 2009-11-18 22:32:16 (GMT) |
| commit | 0186faea383f3f8223bffd1844e5a47ca22770a5 (patch) | |
| tree | 8b17a7c752ada7c06d1d9b88575d5bd467dd3fbe /src/3rdparty/phonon/mmf/audiooutput.h | |
| parent | c7ef9c969fb368027135c5e7b0e9b6f53c465702 (diff) | |
| parent | 80cd617b05ad3e647c87dc063d40cde0617344ca (diff) | |
| download | Qt-0186faea383f3f8223bffd1844e5a47ca22770a5.zip Qt-0186faea383f3f8223bffd1844e5a47ca22770a5.tar.gz Qt-0186faea383f3f8223bffd1844e5a47ca22770a5.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/3rdparty/phonon/mmf/audiooutput.h')
| -rw-r--r-- | src/3rdparty/phonon/mmf/audiooutput.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/3rdparty/phonon/mmf/audiooutput.h b/src/3rdparty/phonon/mmf/audiooutput.h index d0ba086..1e1e134 100644 --- a/src/3rdparty/phonon/mmf/audiooutput.h +++ b/src/3rdparty/phonon/mmf/audiooutput.h @@ -31,12 +31,11 @@ namespace Phonon namespace MMF { class Backend; -class VolumeObserver; /** * @short AudioOutputInterface implementation for MMF. * - * Forwards volume commands to the VolumeObserver instance, + * Forwards volume commands to the MediaObject instance, * which is provided by the backend when MediaNode objects are * connected. * @@ -82,13 +81,8 @@ Q_SIGNALS: void audioDeviceFailed(); private: - - void setVolumeObserver(VolumeObserver* observer); - qreal m_volume; - // Not owned - VolumeObserver* m_observer; }; } } |