Merge branch 'Applications/14.12' into frameworks

[dolphin.git] / src / panels / information / phononwidget.cpp

diff --git a/src/panels/information/phononwidget.cpp b/src/panels/information/phononwidget.cpp
index 16dbabfed26d241ecec860fea081d1b9ab35a674..215be200a1daa990f1a380aef15ed5d9cadf6022 100644 (file)
--- a/src/panels/information/phononwidget.cpp
+++ b/src/panels/information/phononwidget.cpp
@@ -34,8 +34,8 @@
 #include <KDialog>
 #include <QIcon>
 #include <KIconLoader>
 #include <KDialog>
 #include <QIcon>
 #include <KIconLoader>

-#include <KUrl>
-#include <KLocale>
+#include <QUrl>
+#include <KLocalizedString>

 
 class EmbeddedVideoPlayer : public Phonon::VideoWidget
 {
 
 class EmbeddedVideoPlayer : public Phonon::VideoWidget
 {


@@ -73,7 +73,7 @@ PhononWidget::PhononWidget(QWidget *parent)
 {
 }
 
 {
 }
 

-void PhononWidget::setUrl(const KUrl &url)
+void PhononWidget::setUrl(const QUrl &url)

 {
     if (m_url != url) {
         stop(); // emits playingStopped() signal
 {
     if (m_url != url) {
         stop(); // emits playingStopped() signal


@@ -81,7 +81,7 @@ void PhononWidget::setUrl(const KUrl &url)
     }
 }
 
     }
 }
 

-KUrl PhononWidget::url() const
+QUrl PhononWidget::url() const

 {
     return m_url;
 }
 {
     return m_url;
 }


@@ -166,6 +166,12 @@ void PhononWidget::stateChanged(Phonon::State newstate)
         m_stopButton->show();
         m_playButton->hide();
         break;
         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();
     default:
         m_stopButton->hide();
         m_playButton->show();


@@ -185,6 +191,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) {
         m_audioOutput = new Phonon::AudioOutput(Phonon::MusicCategory, this);
         Phonon::createPath(m_media, m_audioOutput);
     if (!m_audioOutput) {
         m_audioOutput = new Phonon::AudioOutput(Phonon::MusicCategory, this);
         Phonon::createPath(m_media, m_audioOutput);


@@ -201,16 +214,7 @@ void PhononWidget::stop()
 {
     if (m_media) {
         m_media->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)
 }
 
 void PhononWidget::slotHasVideoChanged(bool hasVideo)


@@ -218,15 +222,6 @@ void PhononWidget::slotHasVideoChanged(bool hasVideo)
     emit hasVideoChanged(hasVideo);
 
     if (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();
     }
 }
         m_videoPlayer->show();
     }
 }