X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/e5edeb7446c0ec60d0962fb5cd0077c374a472ef..8eb9b508ca87fb1d634d8b8ba62c054ed04466d2:/src/panels/information/phononwidget.cpp?ds=sidebyside

diff --git a/src/panels/information/phononwidget.cpp b/src/panels/information/phononwidget.cpp
index d27b78a3c..b6da339ea 100644
--- a/src/panels/information/phononwidget.cpp
+++ b/src/panels/information/phononwidget.cpp
@@ -23,49 +23,144 @@
 #include <Phonon/Global>
 #include <Phonon/MediaObject>
 #include <Phonon/SeekSlider>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QToolButton>
-#include <kicon.h>
-#include <kurl.h>
-#include <klocale.h>
+#include <Phonon/VideoPlayer>
+
+#include <QVBoxLayout>
+#include <QHBoxLayout>
+#include <QShowEvent>
+#include <QToolButton>
+
+#include <KDialog>
+#include <KIcon>
+#include <KUrl>
+#include <KLocale>
+
+class EmbeddedVideoPlayer : public Phonon::VideoPlayer
+{
+    public:
+        EmbeddedVideoPlayer(Phonon::Category category, QWidget *parent = 0) :
+            Phonon::VideoPlayer(category, parent)
+        {
+        }
+
+        void setSizeHint(const QSize& size)
+        {
+            m_sizeHint = size;
+            updateGeometry();
+        }
+
+        virtual QSize sizeHint() const
+        {
+            return m_sizeHint.isValid() ? m_sizeHint : Phonon::VideoPlayer::sizeHint();
+        }
+
+    private:
+        QSize m_sizeHint;
+};
 
 PhononWidget::PhononWidget(QWidget *parent)
     : QWidget(parent),
+    m_mode(Audio),
     m_url(),
     m_playButton(0),
     m_stopButton(0),
+    m_topLayout(0),
+    m_audioMedia(0),
     m_media(0),
-    m_seekSlider(0)
+    m_seekSlider(0),
+    m_videoPlayer(0)
 {
-    QHBoxLayout *innerLayout = new QHBoxLayout(this);
-    innerLayout->setMargin(0);
-    innerLayout->setSpacing(0);
-    m_playButton = new QToolButton(this);
-    m_stopButton = new QToolButton(this);
-    m_seekSlider = new Phonon::SeekSlider(this);
-    innerLayout->addWidget(m_playButton);
-    innerLayout->addWidget(m_stopButton);
-    innerLayout->addWidget(m_seekSlider);
-
-    m_playButton->setToolTip(i18n("play"));
-    m_playButton->setIconSize(QSize(16, 16));
-    m_playButton->setIcon(KIcon("media-playback-start"));
-    connect(m_playButton, SIGNAL(clicked()), this, SLOT(play()));
-
-    m_stopButton->setToolTip(i18n("stop"));
-    m_stopButton->setIconSize(QSize(16, 16));
-    m_stopButton->setIcon(KIcon("media-playback-stop"));
-    m_stopButton->hide();
-    connect(m_stopButton, SIGNAL(clicked()), this, SLOT(stop()));
-
-    m_seekSlider->setIconVisible(false);
 }
 
 void PhononWidget::setUrl(const KUrl &url)
 {
-    m_url = url;
-    if (m_media) {
-        m_media->setCurrentSource(url);
+    if (m_url != url) {
+        stop(); // emits playingStopped() signal
+        m_url = url;
+    }
+}
+
+KUrl PhononWidget::url() const
+{
+    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) {
+        m_videoSize = size;
+        applyVideoSize();
+    }
+}
+
+QSize PhononWidget::videoSize() const
+{
+    return m_videoSize;
+}
+
+void PhononWidget::showEvent(QShowEvent *event)
+{
+    if (event->spontaneous()) {
+        QWidget::showEvent(event);
+        return;
+    }
+
+    if (m_topLayout == 0) {
+        m_topLayout = new QVBoxLayout(this);
+        m_topLayout->setMargin(0);
+        m_topLayout->setSpacing(KDialog::spacingHint());
+        QHBoxLayout *controlsLayout = new QHBoxLayout(this);
+        controlsLayout->setMargin(0);
+        controlsLayout->setSpacing(0);
+
+        m_playButton = new QToolButton(this);
+        m_stopButton = new QToolButton(this);
+        m_seekSlider = new Phonon::SeekSlider(this);
+
+        controlsLayout->addWidget(m_playButton);
+        controlsLayout->addWidget(m_stopButton);
+        controlsLayout->addWidget(m_seekSlider);
+
+        m_topLayout->addLayout(controlsLayout);
+
+        m_playButton->setToolTip(i18n("play"));
+        m_playButton->setIconSize(QSize(16, 16));
+        m_playButton->setIcon(KIcon("media-playback-start"));
+        connect(m_playButton, SIGNAL(clicked()), this, SLOT(play()));
+
+        m_stopButton->setToolTip(i18n("stop"));
+        m_stopButton->setIconSize(QSize(16, 16));
+        m_stopButton->setIcon(KIcon("media-playback-stop"));
+        m_stopButton->hide();
+        connect(m_stopButton, SIGNAL(clicked()), this, SLOT(stop()));
+
+        m_seekSlider->setIconVisible(false);
+
+        // 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 noticeable blocked, the creation is delayed until
+        // the play button has been pressed (see PhononWidget::play()).
+    }
+}
+
+void PhononWidget::hideEvent(QHideEvent *event)
+{
+    QWidget::hideEvent(event);
+    if (!event->spontaneous()) {
+        stop();
     }
 }
 
@@ -88,23 +183,60 @@ void PhononWidget::stateChanged(Phonon::State newstate)
 
 void PhononWidget::play()
 {
-    requestMedia();
-    m_media->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);
+        m_media->play();
+        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;
+
+    default:
+        break;
+    }
+
+    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 playingStarted();
 }
 
 void PhononWidget::stop()
 {
-    requestMedia();
-    m_media->stop();
+    if (m_media != 0) {
+        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();
+    }
+
+    if (m_videoPlayer != 0) {
+        m_videoPlayer->hide();
+    }
 }
 
-void PhononWidget::requestMedia()
+void PhononWidget::applyVideoSize()
 {
-    if (!m_media) {
-        m_media = Phonon::createPlayer(Phonon::MusicCategory, m_url);
-        m_media->setParent(this);
-        connect(m_media, SIGNAL(stateChanged(Phonon::State, Phonon::State)), SLOT(stateChanged(Phonon::State)));
-        m_seekSlider->setMediaObject(m_media);
+    if ((m_videoPlayer != 0) && m_videoSize.isValid()) {
+        m_videoPlayer->setSizeHint(m_videoSize);
     }
 }
-