Merge branch 'KDE/4.14'

This commit is contained in:
Emmanuel Pescosta 2014-10-29 12:20:10 +01:00
commit 76a7ab4bff

View file

@ -165,6 +165,12 @@ void PhononWidget::stateChanged(Phonon::State newstate)
m_stopButton->show();
m_playButton->hide();
break;
case Phonon::StoppedState:
if (m_videoPlayer) {
m_videoPlayer->hide();
}
emit hasVideoChanged(false);
// fall through
default:
m_stopButton->hide();
m_playButton->show();
@ -207,16 +213,7 @@ void PhononWidget::stop()
{
if (m_media) {
m_media->stop();
m_stopButton->hide();
m_playButton->show();
}
if (m_videoPlayer) {
m_videoPlayer->hide();
}
emit hasVideoChanged(false);
}
void PhononWidget::slotHasVideoChanged(bool hasVideo)