kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-08-21 09:20:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/KDE/4.14'

Browse source
This commit is contained in:
Frank Reininghaus 2014-10-24 18:45:28 +02:00
parent d9700c4d43 3f28c70423
commit 1f02d15f7e
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/panels/information/phononwidget.cpp
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();
}
}