mirror of
https://invent.kde.org/system/dolphin
synced 2024-09-17 15:31:20 +00:00
Merge remote-tracking branch 'origin/KDE/4.14'
This commit is contained in:
commit
1f02d15f7e
|
@ -184,6 +184,13 @@ void PhononWidget::play()
|
||||||
m_seekSlider->setMediaObject(m_media);
|
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) {
|
if (!m_audioOutput) {
|
||||||
m_audioOutput = new Phonon::AudioOutput(Phonon::MusicCategory, this);
|
m_audioOutput = new Phonon::AudioOutput(Phonon::MusicCategory, this);
|
||||||
Phonon::createPath(m_media, m_audioOutput);
|
Phonon::createPath(m_media, m_audioOutput);
|
||||||
|
@ -217,15 +224,6 @@ void PhononWidget::slotHasVideoChanged(bool hasVideo)
|
||||||
emit hasVideoChanged(hasVideo);
|
emit hasVideoChanged(hasVideo);
|
||||||
|
|
||||||
if (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();
|
m_videoPlayer->show();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue