Fix the information panel video player in Dolphin.

Patch from ROSA Linux.

BUG: 337107
BUG: 337033
BUG: 334924
CCBUG: 339882
REVIEW: 120745
FIXED-IN: 4.14.3
This commit is contained in:
Andrey Bondrov 2014-10-24 08:21:37 +02:00 committed by Emmanuel Pescosta
parent 9d6f50ac50
commit 3f28c70423

View file

@ -184,6 +184,13 @@ void PhononWidget::play()
m_seekSlider->setMediaObject(m_media);
}
if (!m_videoPlayer) {
m_videoPlayer = new EmbeddedVideoPlayer(this);
m_topLayout->insertWidget(0, m_videoPlayer);
Phonon::createPath(m_media, m_videoPlayer);
applyVideoSize();
}
if (!m_audioOutput) {
m_audioOutput = new Phonon::AudioOutput(Phonon::MusicCategory, this);
Phonon::createPath(m_media, m_audioOutput);
@ -217,15 +224,6 @@ void PhononWidget::slotHasVideoChanged(bool hasVideo)
emit hasVideoChanged(hasVideo);
if (hasVideo) {
if (!m_videoPlayer) {
// Replay the media to apply path changes
m_media->stop();
m_videoPlayer = new EmbeddedVideoPlayer(this);
m_topLayout->insertWidget(0, m_videoPlayer);
Phonon::createPath(m_media, m_videoPlayer);
m_media->play();
}
applyVideoSize();
m_videoPlayer->show();
}
}