From 18edbfafae7ffb3271c6659da5ce4a29226aaa28 Mon Sep 17 00:00:00 2001 From: James McDonnell Date: Thu, 25 May 2017 13:19:38 -0400 Subject: Switch to mmr_event_t based monitoring The switch is necessary because Multimedia for QNX 7.0.0 removes support for PPS based monitoring. PPS itself is deprecated in QNX 7.0.0. QNX 6.6.0 is also switched to mmr_event_t based monitoring since Multimedia for QNX 6.6.0 also supports that type of monitoring. [ChangeLog][QNX] Switch to mmr_event_t based monitoring. PPS based monitoring is not supported by Multimedia for QNX 7.0.0. Change-Id: Id3ce1d8895e8ce492ecdd49cbe88ef5f0d6b0194 Reviewed-by: Michael Brasser Reviewed-by: Christian Stromme --- src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.h') diff --git a/src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.h b/src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.h index 00f70db34..7216cc7f0 100644 --- a/src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.h +++ b/src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.h @@ -104,10 +104,9 @@ public: void setMetaDataReaderControl(MmRendererMetaDataReaderControl *metaDataReaderControl); 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); @@ -120,6 +119,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(); @@ -144,8 +147,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; @@ -155,7 +156,6 @@ private: QPointer m_videoWindowControl; QPointer m_metaDataReaderControl; MmRendererMetaData m_metaData; - int m_id; qint64 m_position; QMediaPlayer::MediaStatus m_mediaStatus; bool m_playAfterMediaLoaded; -- cgit v1.2.3