--- a/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayerservice.h	Fri Jun 11 14:26:25 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayerservice.h	Wed Jun 23 19:08:38 2010 +0300
@@ -45,9 +45,9 @@
 #include <QtCore/qobject.h>
 
 #include <qmediaservice.h>
-#include <qvideooutputcontrol.h>
+//FIXME #include <qvideooutputcontrol.h>
 
-#include "s60videooutputcontrol.h"
+//FIXME #include "s60videooutputcontrol.h"
 #include "ms60mediaplayerresolver.h"
 
 #include "s60mediaplayeraudioendpointselector.h"
@@ -79,10 +79,11 @@
     S60MediaPlayerService(QObject *parent = 0);
     ~S60MediaPlayerService();
 
-    QMediaControl *control(const char *name) const;
+    QMediaControl *requestControl(const char *name);
+    void releaseControl(QMediaControl *control);
 
-private slots:
-    void videoOutputChanged(QVideoOutputControl::Output output);
+//FIXME  private slots:
+//    void videoOutputChanged(QVideoOutputControl::Output output);
 
 protected: // From MS60MediaPlayerResolver
     S60MediaPlayerSession* PlayerSession();
@@ -91,8 +92,7 @@
     
 private:
     S60MediaPlayerControl *m_control;
-    S60MediaRecognizer *m_mediaRecognizer;
-    mutable S60VideoOutputControl *m_videoOutput;
+//FIXME    mutable S60VideoOutputControl *m_videoOutput;
     S60VideoPlayerSession *m_videoPlayerSession;
     S60AudioPlayerSession *m_audioPlayerSession;
     mutable S60MediaMetaDataProvider *m_metaData;