diff options
author | Justin McPherson <justin.mcpherson@nokia.com> | 2010-03-19 02:56:15 (GMT) |
---|---|---|
committer | Justin McPherson <justin.mcpherson@nokia.com> | 2010-03-19 05:31:59 (GMT) |
commit | 0d4572595698502e04f491bfea3e16bb1851b645 (patch) | |
tree | 3e5545fdf75012a6f899bf4839f4b1556ab9e7e2 /src/imports/multimedia/qdeclarativemediabase_p.h | |
parent | abf09f87af8f57f670904ff25a626d19ec11120b (diff) | |
download | Qt-0d4572595698502e04f491bfea3e16bb1851b645.zip Qt-0d4572595698502e04f491bfea3e16bb1851b645.tar.gz Qt-0d4572595698502e04f491bfea3e16bb1851b645.tar.bz2 |
Fix; QML Video item is sensitive to property assignment order
Task-number: QTBUG-8605
Reviewed-by: Andrew den Exter
Diffstat (limited to 'src/imports/multimedia/qdeclarativemediabase_p.h')
-rw-r--r-- | src/imports/multimedia/qdeclarativemediabase_p.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/imports/multimedia/qdeclarativemediabase_p.h b/src/imports/multimedia/qdeclarativemediabase_p.h index b40e84e..d279f4a 100644 --- a/src/imports/multimedia/qdeclarativemediabase_p.h +++ b/src/imports/multimedia/qdeclarativemediabase_p.h @@ -107,13 +107,14 @@ public: void _q_metaDataChanged(); + void componentComplete(); + protected: void shutdown(); void setObject(QObject *object); virtual void sourceChanged() = 0; - virtual void playingChanged() = 0; virtual void pausedChanged() = 0; @@ -143,6 +144,12 @@ protected: virtual void errorChanged() = 0; + bool m_paused; + bool m_playing; + bool m_muted; + int m_position; + qreal m_volume; + qreal m_playbackRate; QMediaService *m_mediaService; QMediaPlayerControl *m_playerControl; @@ -155,8 +162,8 @@ protected: QMediaPlayer::State m_state; QMediaPlayer::MediaStatus m_status; QMediaPlayer::Error m_error; - bool m_paused; QString m_errorString; + QUrl m_source; friend class QDeclarativeMediaBaseAnimation; }; |