diff -r 56cd8111b7f7 -r 41300fa6a67c src/3rdparty/phonon/mmf/mediaobject.h
--- a/src/3rdparty/phonon/mmf/mediaobject.h	Tue Jan 26 12:42:25 2010 +0200
+++ b/src/3rdparty/phonon/mmf/mediaobject.h	Tue Feb 02 00:43:10 2010 +0200
@@ -30,7 +30,6 @@
 #include "abstractplayer.h"
 #include "mmf_medianode.h"
 #include "defs.h"
-#include "volumeobserver.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -46,7 +45,6 @@
  */
 class MediaObject : public MediaNode
                   , public MediaObjectInterface
-                  , public VolumeObserver
 {
     Q_OBJECT
     Q_INTERFACES(Phonon::MediaObjectInterface)
@@ -77,9 +75,6 @@
     virtual qint32 transitionTime() const;
     virtual void setTransitionTime(qint32);
 
-    // VolumeObserver
-    void volumeChanged(qreal volume);
-
     /**
      * This class owns the AbstractPlayer, and will delete it upon
      * destruction.
@@ -90,6 +85,9 @@
 
     virtual bool activateOnMediaObject(MediaObject *);
 
+public Q_SLOTS:
+    void volumeChanged(qreal volume);
+
 Q_SIGNALS:
     void totalTimeChanged(qint64 length);
     void hasVideoChanged(bool hasVideo);