--- a/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60videowidget.h	Fri Jun 11 14:26:25 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60videowidget.h	Wed Jun 23 19:08:38 2010 +0300
@@ -47,7 +47,28 @@
 
 QT_USE_NAMESPACE
 
-class QBlackWidget : public QWidget
+class QAbstractVideoWidget : public QWidget
+{
+    Q_OBJECT
+
+public:
+    QAbstractVideoWidget(QWidget *parent = 0);
+    virtual ~QAbstractVideoWidget();
+};
+
+class QBlackSurface : public QAbstractVideoWidget
+{
+    Q_OBJECT
+
+public:
+    QBlackSurface(QWidget *parent = 0);
+    virtual ~QBlackSurface();
+
+protected:
+    void paintEvent(QPaintEvent *event);
+};
+
+class QBlackWidget : public QAbstractVideoWidget
 {
     Q_OBJECT
     
@@ -95,6 +116,9 @@
 
     //new methods
     WId videoWidgetWId();
+    QSize videoWidgetSize();
+private:
+    void initializeVideoOutput();
     
 signals:
     void widgetUpdated();
@@ -105,7 +129,7 @@
     void videoStateChanged(QMediaPlayer::State state);
     
 private:
-    QBlackWidget *m_widget;
+    QAbstractVideoWidget *m_widget;
     Qt::AspectRatioMode m_aspectRatioMode;
 };