--- a/qtmobility/plugins/multimedia/directshow/player/directshowplayercontrol.h	Fri Apr 16 15:51:22 2010 +0300
+++ b/qtmobility/plugins/multimedia/directshow/player/directshowplayercontrol.h	Mon May 03 13:18:40 2010 +0300
@@ -42,8 +42,8 @@
 #ifndef DIRECTSHOWPLAYERCONTROL_H
 #define DIRECTSHOWPLAYERCONTROL_H
 
-#include <qmediacontent.h>
-#include <qmediaplayercontrol.h>
+#include "../../src/multimedia/qmediacontent.h"
+#include "../../src/multimedia/qmediaplayercontrol.h"
 
 #include <QtCore/qcoreevent.h>
 
@@ -98,8 +98,8 @@
     void updateMediaInfo(qint64 duration, int streamTypes, bool seekable);
     void updatePlaybackRate(qreal rate);
     void updateAudioOutput(IBaseFilter *filter);
-
-    using QMediaPlayerControl::error;
+    void updateError(QMediaPlayer::Error error, const QString &errorString);
+    void updatePosition(qint64 position);
 
 protected:
     void customEvent(QEvent *event);
@@ -112,7 +112,9 @@
         StreamTypesProperty  = 0x04,
         DurationProperty     = 0x08,
         PlaybackRateProperty = 0x10,
-        SeekableProperty     = 0x20
+        SeekableProperty     = 0x20,
+        ErrorProperty        = 0x40,
+        PositionProperty     = 0x80
     };
 
     enum Event
@@ -121,6 +123,7 @@
     };
 
     void scheduleUpdate(int properties);
+    void emitPropertyChanges();
 
     DirectShowPlayerService *m_service;
     IBasicAudio *m_audio;
@@ -128,12 +131,15 @@
     int m_updateProperties;
     QMediaPlayer::State m_state;
     QMediaPlayer::MediaStatus m_status;
+    QMediaPlayer::Error m_error;
     int m_streamTypes;
     int m_muteVolume;
+    qint64 m_position;
     qint64 m_duration;
     qreal m_playbackRate;
     bool m_seekable;
     QMediaContent m_media;
+    QString m_errorString;
     
 };