diff options
author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-09-25 18:55:25 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-09-25 18:55:25 +0200 |
commit | 1e2702e86dbd2b3de69c58438bcfcf6276124547 (patch) | |
tree | f1f79f2dbfa93f6ef4a3ea296cba2330a0c8556a /src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.cpp | |
parent | 94a204b4775d750ed30d56f333d5433ef3e0b27e (diff) | |
parent | 020e7b4c198f5e74dd83da7fa8e64a02b14af2f9 (diff) |
Merge 5.9 into 5.9.2v5.9.2
Change-Id: Ia35d6229b7c9889bdbaea72decc78e927ca0f2db
Diffstat (limited to 'src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.cpp')
-rw-r--r-- | src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.cpp b/src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.cpp index 5cd3bc3d2..c4207af0b 100644 --- a/src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.cpp +++ b/src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.cpp @@ -58,14 +58,14 @@ static int idCounter = 0; MmRendererMediaPlayerControl::MmRendererMediaPlayerControl(QObject *parent) : QMediaPlayerControl(parent), - m_connection(0), m_context(0), + m_id(-1), + m_connection(0), m_audioId(-1), m_state(QMediaPlayer::StoppedState), m_volume(100), m_muted(false), m_rate(1), - m_id(-1), m_position(0), m_mediaStatus(QMediaPlayer::NoMedia), m_playAfterMediaLoaded(false), @@ -106,7 +106,7 @@ void MmRendererMediaPlayerControl::openConnection() return; } - startMonitoring(m_id, m_contextName); + startMonitoring(); } void MmRendererMediaPlayerControl::handleMmStatusUpdate(qint64 newPosition) @@ -469,11 +469,6 @@ void MmRendererMediaPlayerControl::continueLoadMedia() play(); } -QString MmRendererMediaPlayerControl::contextName() const -{ - return m_contextName; -} - MmRendererVideoWindowControl *MmRendererMediaPlayerControl::videoWindowControl() const { return m_videoWindowControl; |