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.cpp | |
parent | 230f070c7ed353605260f9fa79d0a5bc5181321c (diff) | |
parent | 51b361faa703e157feaa0cfd79e7d473cb704811 (diff) |
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: Ib7c41a4cd7fd6976ebab52673898888dfac53db5
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 0350958de..83e24dc67 100644 --- a/src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.cpp +++ b/src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.cpp @@ -59,14 +59,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::handleMmStopped() @@ -456,11 +456,6 @@ void MmRendererMediaPlayerControl::continueLoadMedia() play(); } -QString MmRendererMediaPlayerControl::contextName() const -{ - return m_contextName; -} - MmRendererVideoWindowControl *MmRendererMediaPlayerControl::videoWindowControl() const { return m_videoWindowControl; |