diff options
author | Christian Strømme <christian.stromme@qt.io> | 2017-09-26 15:43:23 +0200 |
---|---|---|
committer | Christian Strømme <christian.stromme@qt.io> | 2017-09-26 15:43:23 +0200 |
commit | 2972eaa1330f377a7c3b1f583a643dbfbfc9531e (patch) | |
tree | b3407be7bba8c50df76a550c5c2867061c6dea95 /src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.h | |
parent | 230f070c7ed353605260f9fa79d0a5bc5181321c (diff) | |
parent | 51b361faa703e157feaa0cfd79e7d473cb704811 (diff) | |
download | qtmultimedia-2972eaa1330f377a7c3b1f583a643dbfbfc9531e.tar.gz |
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: Ib7c41a4cd7fd6976ebab52673898888dfac53db5
Diffstat (limited to 'src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.h')
-rw-r--r-- | src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.h b/src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.h index 655570656..cff536f4d 100644 --- a/src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.h +++ b/src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.h @@ -106,10 +106,9 @@ public: void setAudioRoleControl(MmRendererAudioRoleControl *audioRoleControl); protected: - virtual void startMonitoring(int contextId, const QString &contextName) = 0; + virtual void startMonitoring() = 0; virtual void stopMonitoring() = 0; - QString contextName() const; void openConnection(); void emitMmError(const QString &msg); void emitPError(const QString &msg); @@ -121,6 +120,10 @@ protected: // must be called from subclass dtors (calls virtual function stopMonitoring()) void destroy(); + mmr_context_t *m_context; + int m_id; + QString m_contextName; + private Q_SLOTS: void continueLoadMedia(); @@ -145,8 +148,6 @@ private: QMediaContent m_media; mmr_connection_t *m_connection; - mmr_context_t *m_context; - QString m_contextName; int m_audioId; QMediaPlayer::State m_state; int m_volume; @@ -157,7 +158,6 @@ private: QPointer<MmRendererMetaDataReaderControl> m_metaDataReaderControl; QPointer<MmRendererAudioRoleControl> m_audioRoleControl; MmRendererMetaData m_metaData; - int m_id; qint64 m_position; QMediaPlayer::MediaStatus m_mediaStatus; bool m_playAfterMediaLoaded; |