X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/e5edeb7446c0ec60d0962fb5cd0077c374a472ef..48b58f830a585b773435c9af5ee2fe8f0c7c641d:/src/panels/information/phononwidget.cpp

diff --git a/src/panels/information/phononwidget.cpp b/src/panels/information/phononwidget.cpp
index d27b78a3c..fed6b0ee2 100644
--- a/src/panels/information/phononwidget.cpp
+++ b/src/panels/information/phononwidget.cpp
@@ -20,52 +20,136 @@
 
 #include "phononwidget.h"
 
-#include <Phonon/Global>
+#include <KIconLoader>
+#include <KLocalizedString>
+#include <Phonon/AudioOutput>
 #include <Phonon/MediaObject>
 #include <Phonon/SeekSlider>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QToolButton>
-#include <kicon.h>
-#include <kurl.h>
-#include <klocale.h>
+#include <Phonon/VideoWidget>
+
+#include <QShowEvent>
+#include <QToolButton>
+#include <QVBoxLayout>
+
+class EmbeddedVideoPlayer : public Phonon::VideoWidget
+{
+    Q_OBJECT
+
+    public:
+        EmbeddedVideoPlayer(QWidget *parent = nullptr) :
+            Phonon::VideoWidget(parent)
+        {
+        }
+
+        void setSizeHint(const QSize& size)
+        {
+            m_sizeHint = size;
+            updateGeometry();
+        }
+
+        QSize sizeHint() const override
+        {
+            return m_sizeHint.isValid() ? m_sizeHint : Phonon::VideoWidget::sizeHint();
+        }
+
+    private:
+        QSize m_sizeHint;
+};
 
 PhononWidget::PhononWidget(QWidget *parent)
     : QWidget(parent),
     m_url(),
-    m_playButton(0),
-    m_stopButton(0),
-    m_media(0),
-    m_seekSlider(0)
+    m_playButton(nullptr),
+    m_stopButton(nullptr),
+    m_topLayout(nullptr),
+    m_media(nullptr),
+    m_seekSlider(nullptr),
+    m_audioOutput(nullptr),
+    m_videoPlayer(nullptr)
 {
-    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)
+void PhononWidget::setUrl(const QUrl &url)
 {
-    m_url = url;
-    if (m_media) {
-        m_media->setCurrentSource(url);
+    if (m_url != url) {
+        stop(); // emits playingStopped() signal
+        m_url = url;
+    }
+}
+
+QUrl PhononWidget::url() const
+{
+    return m_url;
+}
+
+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) {
+        m_topLayout = new QVBoxLayout(this);
+        m_topLayout->setMargin(0);
+
+        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);
+
+        const int smallIconSize = IconSize(KIconLoader::Small);
+        const QSize buttonSize(smallIconSize, smallIconSize);
+
+        m_playButton->setToolTip(i18n("play"));
+        m_playButton->setIconSize(buttonSize);
+        m_playButton->setIcon(QIcon::fromTheme(QStringLiteral("media-playback-start")));
+        m_playButton->setAutoRaise(true);
+        connect(m_playButton, &QToolButton::clicked, this, &PhononWidget::play);
+
+        m_stopButton->setToolTip(i18n("stop"));
+        m_stopButton->setIconSize(buttonSize);
+        m_stopButton->setIcon(QIcon::fromTheme(QStringLiteral("media-playback-stop")));
+        m_stopButton->setAutoRaise(true);
+        m_stopButton->hide();
+        connect(m_stopButton, &QToolButton::clicked, this, &PhononWidget::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();
     }
 }
 
@@ -78,6 +162,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();
@@ -88,23 +178,55 @@ void PhononWidget::stateChanged(Phonon::State newstate)
 
 void PhononWidget::play()
 {
-    requestMedia();
+    if (!m_media) {
+        m_media = new Phonon::MediaObject(this);
+        connect(m_media, &Phonon::MediaObject::stateChanged,
+                this, &PhononWidget::stateChanged);
+        connect(m_media, &Phonon::MediaObject::hasVideoChanged,
+                this, &PhononWidget::slotHasVideoChanged);
+        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);
+    }
+
+    emit hasVideoChanged(false);
+
+    m_media->setCurrentSource(m_url);
+    m_media->hasVideo();
     m_media->play();
 }
 
 void PhononWidget::stop()
 {
-    requestMedia();
-    m_media->stop();
+    if (m_media) {
+        m_media->stop();
+    }
+}
+
+void PhononWidget::slotHasVideoChanged(bool hasVideo)
+{
+    emit hasVideoChanged(hasVideo);
+
+    if (hasVideo) {
+        m_videoPlayer->show();
+    }
 }
 
-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) && m_videoSize.isValid()) {
+        m_videoPlayer->setSizeHint(m_videoSize);
     }
 }
 
+#include "phononwidget.moc"