summaryrefslogtreecommitdiffstats
path: root/src/plugins/mediaservices/directshow/mediaplayer/directshowplayercontrol.h
diff options
context:
space:
mode:
authorAndrew den Exter <andrew.den-exter@nokia.com>2010-02-10 06:51:43 (GMT)
committerAndrew den Exter <andrew.den-exter@nokia.com>2010-02-10 06:51:43 (GMT)
commiteab600d2d58a2f638636281ec5db65b4a07b890f (patch)
treea4bd707351b51cb76633798b5e2836a28ce39287 /src/plugins/mediaservices/directshow/mediaplayer/directshowplayercontrol.h
parentaec0628295cda95f2169e3007368797ba6585ee3 (diff)
downloadQt-eab600d2d58a2f638636281ec5db65b4a07b890f.zip
Qt-eab600d2d58a2f638636281ec5db65b4a07b890f.tar.gz
Qt-eab600d2d58a2f638636281ec5db65b4a07b890f.tar.bz2
Emit an error if given a QIODevice that is unusable.
Where unusable is not readable or sequential.
Diffstat (limited to 'src/plugins/mediaservices/directshow/mediaplayer/directshowplayercontrol.h')
-rw-r--r--src/plugins/mediaservices/directshow/mediaplayer/directshowplayercontrol.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/plugins/mediaservices/directshow/mediaplayer/directshowplayercontrol.h b/src/plugins/mediaservices/directshow/mediaplayer/directshowplayercontrol.h
index af2cd3f..6706bab 100644
--- a/src/plugins/mediaservices/directshow/mediaplayer/directshowplayercontrol.h
+++ b/src/plugins/mediaservices/directshow/mediaplayer/directshowplayercontrol.h
@@ -101,8 +101,7 @@ public:
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);
protected:
void customEvent(QEvent *event);
@@ -115,7 +114,8 @@ private:
StreamTypesProperty = 0x04,
DurationProperty = 0x08,
PlaybackRateProperty = 0x10,
- SeekableProperty = 0x20
+ SeekableProperty = 0x20,
+ ErrorProperty = 0x40
};
enum Event
@@ -124,6 +124,7 @@ private:
};
void scheduleUpdate(int properties);
+ void emitPropertyChanges();
DirectShowPlayerService *m_service;
IBasicAudio *m_audio;
@@ -131,12 +132,14 @@ private:
int m_updateProperties;
QMediaPlayer::State m_state;
QMediaPlayer::MediaStatus m_status;
+ QMediaPlayer::Error m_error;
int m_streamTypes;
int m_muteVolume;
qint64 m_duration;
qreal m_playbackRate;
bool m_seekable;
QMediaContent m_media;
+ QString m_errorString;
};