Show video previews according to file content instead of the mimetype-string

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

diff --git a/src/panels/information/phononwidget.cpp b/src/panels/information/phononwidget.cpp
index 7f2ca95648120696d3f78b06bffb0f436c2dc19e..1419f68be9b80e425b08b59285458db22817a93a 100644 (file)
--- a/src/panels/information/phononwidget.cpp
+++ b/src/panels/information/phononwidget.cpp
@@ -20,26 +20,27 @@
 
 #include "phononwidget.h"
 
 
 #include "phononwidget.h"
 

+#include <Phonon/AudioOutput>

 #include <Phonon/Global>
 #include <Phonon/MediaObject>
 #include <Phonon/SeekSlider>
 #include <Phonon/Global>
 #include <Phonon/MediaObject>
 #include <Phonon/SeekSlider>

-#include <Phonon/VideoPlayer>
+#include <Phonon/VideoWidget>

 
 

-#include <QtGui/QVBoxLayout>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QShowEvent>
-#include <QtGui/QToolButton>
+#include <QVBoxLayout>
+#include <QHBoxLayout>
+#include <QShowEvent>
+#include <QToolButton>

 
 

-#include <kdialog.h>
-#include <kicon.h>
-#include <kurl.h>
-#include <klocale.h>
+#include <KDialog>
+#include <KIcon>
+#include <KUrl>
+#include <KLocale>

 
 

-class EmbeddedVideoPlayer : public Phonon::VideoPlayer
+class EmbeddedVideoPlayer : public Phonon::VideoWidget

 {
     public:
 {
     public:

-        EmbeddedVideoPlayer(Phonon::Category category, QWidget *parent = 0) :
-            Phonon::VideoPlayer(category, parent)
+        EmbeddedVideoPlayer(QWidget *parent = 0) :
+            Phonon::VideoWidget(parent)

         {
         }
 
         {
         }
 


@@ -51,7 +52,7 @@ class EmbeddedVideoPlayer : public Phonon::VideoPlayer
 
         virtual QSize sizeHint() const
         {
 
         virtual QSize sizeHint() const
         {

-            return m_sizeHint.isValid() ? m_sizeHint : Phonon::VideoPlayer::sizeHint();
+            return m_sizeHint.isValid() ? m_sizeHint : Phonon::VideoWidget::sizeHint();

         }
 
     private:
         }
 
     private:


@@ -60,14 +61,13 @@ class EmbeddedVideoPlayer : public Phonon::VideoPlayer
 
 PhononWidget::PhononWidget(QWidget *parent)
     : QWidget(parent),
 
 PhononWidget::PhononWidget(QWidget *parent)
     : QWidget(parent),

-    m_mode(Audio),

     m_url(),
     m_playButton(0),
     m_stopButton(0),
     m_topLayout(0),
     m_url(),
     m_playButton(0),
     m_stopButton(0),
     m_topLayout(0),

-    m_audioMedia(0),

     m_media(0),
     m_seekSlider(0),
     m_media(0),
     m_seekSlider(0),

+    m_audioOutput(0),

     m_videoPlayer(0)
 {
 }
     m_videoPlayer(0)
 {
 }


@@ -85,19 +85,6 @@ KUrl PhononWidget::url() const
     return m_url;
 }
 
     return m_url;
 }
 

-void PhononWidget::setMode(Mode mode)
-{
-    if (m_mode != mode) {
-        stop(); // emits playingStopped() signal
-        m_mode = mode;
-    }
-}
-
-PhononWidget::Mode PhononWidget::mode() const
-{
-    return m_mode;
-}
-

 void PhononWidget::setVideoSize(const QSize& size)
 {
     if (m_videoSize != size) {
 void PhononWidget::setVideoSize(const QSize& size)
 {
     if (m_videoSize != size) {


@@ -118,7 +105,7 @@ void PhononWidget::showEvent(QShowEvent *event)
         return;
     }
 
         return;
     }
 

-    if (m_topLayout == 0) {
+    if (!m_topLayout) {

         m_topLayout = new QVBoxLayout(this);
         m_topLayout->setMargin(0);
         m_topLayout->setSpacing(KDialog::spacingHint());
         m_topLayout = new QVBoxLayout(this);
         m_topLayout->setMargin(0);
         m_topLayout->setSpacing(KDialog::spacingHint());


@@ -151,7 +138,7 @@ void PhononWidget::showEvent(QShowEvent *event)
 
         // Creating an audio player or video player instance might take up to
         // 2 seconds when doing it the first time. To prevent that the user
 
         // Creating an audio player or video player instance might take up to
         // 2 seconds when doing it the first time. To prevent that the user

-        // interface gets noticable blocked, the creation is delayed until
+        // interface gets noticeable blocked, the creation is delayed until

         // the play button has been pressed (see PhononWidget::play()).
     }
 }
         // the play button has been pressed (see PhononWidget::play()).
     }
 }


@@ -183,59 +170,64 @@ void PhononWidget::stateChanged(Phonon::State newstate)
 
 void PhononWidget::play()
 {
 
 void PhononWidget::play()
 {

-    switch (m_mode) {
-    case Audio:
-        if (m_audioMedia == 0) {
-            m_audioMedia = Phonon::createPlayer(Phonon::MusicCategory, m_url);
-            m_audioMedia->setParent(this);
-        }
-        m_media = m_audioMedia;
-        m_media->setCurrentSource(m_url);
-        break;
-
-    case Video:
-        if (m_videoPlayer == 0) {
-            m_videoPlayer = new EmbeddedVideoPlayer(Phonon::VideoCategory, this);
-            m_topLayout->insertWidget(0, m_videoPlayer);
-        }
-        applyVideoSize();
-        m_videoPlayer->show();
-        m_videoPlayer->play(m_url);
-        m_media = m_videoPlayer->mediaObject();
-        break;
+    if (!m_media) {
+        m_media = new Phonon::MediaObject(this);
+        connect(m_media, SIGNAL(stateChanged(Phonon::State,Phonon::State)),
+                this, SLOT(stateChanged(Phonon::State)));
+        connect(m_media, SIGNAL(hasVideoChanged(bool)),
+                this, SLOT(slotHasVideoChanged(bool)));
+        m_seekSlider->setMediaObject(m_media);
+    }

 
 

-    default:
-        break;
+    if (!m_audioOutput) {
+        m_audioOutput = new Phonon::AudioOutput(Phonon::MusicCategory, this);
+        Phonon::createPath(m_media, m_audioOutput);

     }
 
     }
 

-    Q_ASSERT(m_media != 0);
-    connect(m_media, SIGNAL(stateChanged(Phonon::State, Phonon::State)),
-            this, SLOT(stateChanged(Phonon::State)));
-    m_seekSlider->setMediaObject(m_media);
+    emit hasVideoChanged(false);

 
 

-    emit playingStarted();
+    m_media->setCurrentSource(m_url);
+    m_media->hasVideo();
+    m_media->play();

 }
 
 void PhononWidget::stop()
 {
 }
 
 void PhononWidget::stop()
 {

-    if (m_media != 0) {
+    if (m_media) {

         m_media->stop();
         m_media->stop();

-        disconnect(m_media, SIGNAL(stateChanged(Phonon::State, Phonon::State)),
-                   this, SLOT(stateChanged(Phonon::State)));
-        emit playingStopped();

 
         m_stopButton->hide();
         m_playButton->show();
     }
 
 
         m_stopButton->hide();
         m_playButton->show();
     }
 

-    if (m_videoPlayer != 0) {
+    if (m_videoPlayer) {

         m_videoPlayer->hide();
     }
         m_videoPlayer->hide();
     }

+
+    emit hasVideoChanged(false);
+}
+
+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();
+    }

 }
 
 void PhononWidget::applyVideoSize()
 {
 }
 
 void PhononWidget::applyVideoSize()
 {

-    if ((m_videoPlayer != 0) && m_videoSize.isValid()) {
+    if ((m_videoPlayer) && m_videoSize.isValid()) {

         m_videoPlayer->setSizeHint(m_videoSize);
     }
 }
         m_videoPlayer->setSizeHint(m_videoSize);
     }
 }