X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/4315e5c9380e22eed483f00adac3d075369eae49..c2fa8ae9ab0df08781b7d032e99d7b8f220c10e0:/src/panels/information/phononwidget.cpp

diff --git a/src/panels/information/phononwidget.cpp b/src/panels/information/phononwidget.cpp
index 95f535713..f815b4bd0 100644
--- a/src/panels/information/phononwidget.cpp
+++ b/src/panels/information/phononwidget.cpp
@@ -20,7 +20,6 @@
 
 #include "phononwidget.h"
 
-#include <KIconLoader>
 #include <KLocalizedString>
 #include <Phonon/AudioOutput>
 #include <Phonon/MediaObject>
@@ -28,6 +27,7 @@
 #include <Phonon/VideoWidget>
 
 #include <QShowEvent>
+#include <QStyle>
 #include <QToolButton>
 #include <QVBoxLayout>
 
@@ -60,7 +60,7 @@ PhononWidget::PhononWidget(QWidget *parent)
     : QWidget(parent),
     m_url(),
     m_playButton(nullptr),
-    m_stopButton(nullptr),
+    m_pauseButton(nullptr),
     m_topLayout(nullptr),
     m_media(nullptr),
     m_seekSlider(nullptr),
@@ -69,11 +69,24 @@ PhononWidget::PhononWidget(QWidget *parent)
 {
 }
 
-void PhononWidget::setUrl(const QUrl &url)
+void PhononWidget::setUrl(const QUrl &url, MediaKind kind)
 {
     if (m_url != url) {
-        stop(); // emits playingStopped() signal
         m_url = url;
+        m_isVideo = kind == MediaKind::Video;
+    }
+    if (m_autoPlay) {
+        play();
+    } else {
+        stop();
+    }
+}
+
+void PhononWidget::setAutoPlay(bool autoPlay)
+{
+    m_autoPlay = autoPlay;
+    if (!m_url.isEmpty() && (m_media == nullptr || m_media->state() != Phonon::State::PlayingState) && m_autoPlay && isVisible()) {
+        play();
     }
 }
 
@@ -82,6 +95,34 @@ QUrl PhononWidget::url() const
     return m_url;
 }
 
+void PhononWidget::clearUrl()
+{
+    m_url.clear();
+}
+
+void PhononWidget::togglePlayback()
+{
+    if (m_media && m_media->state() == Phonon::State::PlayingState) {
+        m_media->pause();
+    } else {
+        play();
+    }
+}
+
+bool PhononWidget::eventFilter(QObject *object, QEvent *event)
+{
+    Q_UNUSED(object)
+    if (event->type() == QEvent::MouseButtonPress) {
+        const QMouseEvent *mouseEvent = static_cast<QMouseEvent*>(event);
+        if (mouseEvent->button() == Qt::LeftButton) {
+            // toggle playback
+            togglePlayback();
+            return true;
+        }
+    }
+    return false;
+}
+
 void PhononWidget::setVideoSize(const QSize& size)
 {
     if (m_videoSize != size) {
@@ -106,21 +147,21 @@ void PhononWidget::showEvent(QShowEvent *event)
         m_topLayout = new QVBoxLayout(this);
         m_topLayout->setContentsMargins(0, 0, 0, 0);
 
-        QHBoxLayout *controlsLayout = new QHBoxLayout(this);
+        QHBoxLayout *controlsLayout = new QHBoxLayout();
         controlsLayout->setContentsMargins(0, 0, 0, 0);
         controlsLayout->setSpacing(0);
 
         m_playButton = new QToolButton(this);
-        m_stopButton = new QToolButton(this);
+        m_pauseButton = new QToolButton(this);
         m_seekSlider = new Phonon::SeekSlider(this);
 
         controlsLayout->addWidget(m_playButton);
-        controlsLayout->addWidget(m_stopButton);
+        controlsLayout->addWidget(m_pauseButton);
         controlsLayout->addWidget(m_seekSlider);
 
         m_topLayout->addLayout(controlsLayout);
 
-        const int smallIconSize = IconSize(KIconLoader::Small);
+        const int smallIconSize = style()->pixelMetric(QStyle::PM_SmallIconSize);
         const QSize buttonSize(smallIconSize, smallIconSize);
 
         m_playButton->setToolTip(i18n("play"));
@@ -129,12 +170,12 @@ void PhononWidget::showEvent(QShowEvent *event)
         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_pauseButton->setToolTip(i18n("pause"));
+        m_pauseButton->setIconSize(buttonSize);
+        m_pauseButton->setIcon(QIcon::fromTheme(QStringLiteral("media-playback-pause")));
+        m_pauseButton->setAutoRaise(true);
+        m_pauseButton->hide();
+        connect(m_pauseButton, &QToolButton::clicked, this, &PhononWidget::togglePlayback);
 
         m_seekSlider->setIconVisible(false);
 
@@ -159,17 +200,11 @@ void PhononWidget::stateChanged(Phonon::State newstate)
     switch (newstate) {
     case Phonon::PlayingState:
     case Phonon::BufferingState:
-        m_stopButton->show();
         m_playButton->hide();
+        m_pauseButton->show();
         break;
-    case Phonon::StoppedState:
-        if (m_videoPlayer) {
-            m_videoPlayer->hide();
-        }
-        emit hasVideoChanged(false);
-        Q_FALLTHROUGH();
     default:
-        m_stopButton->hide();
+        m_pauseButton->hide();
         m_playButton->show();
         break;
     }
@@ -182,13 +217,15 @@ void PhononWidget::play()
         m_media = new Phonon::MediaObject(this);
         connect(m_media, &Phonon::MediaObject::stateChanged,
                 this, &PhononWidget::stateChanged);
-        connect(m_media, &Phonon::MediaObject::hasVideoChanged,
-                this, &PhononWidget::slotHasVideoChanged);
+        connect(m_media, &Phonon::MediaObject::finished,
+                this, &PhononWidget::finished);
         m_seekSlider->setMediaObject(m_media);
     }
 
     if (!m_videoPlayer) {
         m_videoPlayer = new EmbeddedVideoPlayer(this);
+        m_videoPlayer->setCursor(Qt::PointingHandCursor);
+        m_videoPlayer->installEventFilter(this);
         m_topLayout->insertWidget(0, m_videoPlayer);
         Phonon::createPath(m_media, m_videoPlayer);
         applyVideoSize();
@@ -199,26 +236,37 @@ void PhononWidget::play()
         Phonon::createPath(m_media, m_audioOutput);
     }
 
-    emit hasVideoChanged(false);
+    if (m_isVideo) {
+        emit hasVideoChanged(true);
+    }
 
-    m_media->setCurrentSource(m_url);
-    m_media->hasVideo();
+    if (m_url != m_media->currentSource().url()) {
+        m_media->setCurrentSource(m_url);
+    }
     m_media->play();
+
+    m_videoPlayer->setVisible(m_isVideo);
 }
 
-void PhononWidget::stop()
+void PhononWidget::finished()
 {
-    if (m_media) {
-        m_media->stop();
+    if (m_isVideo) {
+        m_videoPlayer->hide();
+        emit hasVideoChanged(false);
     }
 }
 
-void PhononWidget::slotHasVideoChanged(bool hasVideo)
+Phonon::State PhononWidget::state() const
 {
-    emit hasVideoChanged(hasVideo);
+    return m_media == nullptr ? Phonon::State::StoppedState : m_media->state();
+}
 
-    if (hasVideo) {
-        m_videoPlayer->show();
+void PhononWidget::stop()
+{
+    if (m_media) {
+        m_media->stop();
+        m_videoPlayer->hide();
+        emit hasVideoChanged(false);
     }
 }