Don't block unmounting when terminal panel's cwd is the mountpoint

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

diff --git a/src/panels/information/phononwidget.cpp b/src/panels/information/phononwidget.cpp
index 405172b8d4301b38d5dfa073c2498c1ed7f9785a..ac4a32506d179eb3a869b52dab8e5d63cfd94856 100644 (file)
--- a/src/panels/information/phononwidget.cpp
+++ b/src/panels/information/phononwidget.cpp
@@ -20,32 +20,61 @@
 
 #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 <QtGui/QVBoxLayout>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QShowEvent>
-#include <QtGui/QToolButton>
-#include <kicon.h>
-#include <kurl.h>
-#include <klocale.h>
+#include <Phonon/VideoWidget>
+
+#include <QVBoxLayout>
+#include <QHBoxLayout>
+#include <QShowEvent>
+#include <QToolButton>
+#include <QDialog>
+#include <QIcon>
+#include <KIconLoader>
+#include <QUrl>
+#include <KLocalizedString>
+
+class EmbeddedVideoPlayer : public Phonon::VideoWidget
+{
+    Q_OBJECT
+
+    public:
+        EmbeddedVideoPlayer(QWidget *parent = 0) :
+            Phonon::VideoWidget(parent)
+        {
+        }
+
+        void setSizeHint(const QSize& size)
+        {
+            m_sizeHint = size;
+            updateGeometry();
+        }
+
+        QSize sizeHint() const Q_DECL_OVERRIDE
+        {
+            return m_sizeHint.isValid() ? m_sizeHint : Phonon::VideoWidget::sizeHint();
+        }
+
+    private:
+        QSize m_sizeHint;
+};

 
 PhononWidget::PhononWidget(QWidget *parent)
     : QWidget(parent),
 
 PhononWidget::PhononWidget(QWidget *parent)
     : QWidget(parent),

-    m_mode(Audio),

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

-    m_audioMedia(0),
+    m_topLayout(0),

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

+    m_audioOutput(0),

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

-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


@@ -53,22 +82,22 @@ void PhononWidget::setUrl(const KUrl &url)
     }
 }
 
     }
 }
 

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

 {
     return m_url;
 }
 
 {
     return m_url;
 }
 

-void PhononWidget::setMode(Mode mode)
+void PhononWidget::setVideoSize(const QSize& size)

 {
 {

-    if (m_mode != mode) {
-        stop(); // emits playingStopped() signal
-        m_mode = mode;
+    if (m_videoSize != size) {
+        m_videoSize = size;
+        applyVideoSize();

     }
 }
 
     }
 }
 

-PhononWidget::Mode PhononWidget::mode() const
+QSize PhononWidget::videoSize() const

 {
 {

-    return m_mode;
+    return m_videoSize;

 }
 
 void PhononWidget::showEvent(QShowEvent *event)
 }
 
 void PhononWidget::showEvent(QShowEvent *event)


@@ -78,10 +107,10 @@ void PhononWidget::showEvent(QShowEvent *event)
         return;
     }
 
         return;
     }
 

-    if (m_playButton == 0) {
-        QVBoxLayout *topLayout = new QVBoxLayout(this);
-        topLayout->setMargin(0);
-        topLayout->setSpacing(0);
+    if (!m_topLayout) {
+        m_topLayout = new QVBoxLayout(this);
+        m_topLayout->setMargin(0);
+

         QHBoxLayout *controlsLayout = new QHBoxLayout(this);
         controlsLayout->setMargin(0);
         controlsLayout->setSpacing(0);
         QHBoxLayout *controlsLayout = new QHBoxLayout(this);
         controlsLayout->setMargin(0);
         controlsLayout->setSpacing(0);


@@ -89,28 +118,35 @@ void PhononWidget::showEvent(QShowEvent *event)
         m_playButton = new QToolButton(this);
         m_stopButton = new QToolButton(this);
         m_seekSlider = new Phonon::SeekSlider(this);
         m_playButton = new QToolButton(this);
         m_stopButton = new QToolButton(this);
         m_seekSlider = new Phonon::SeekSlider(this);

-        m_videoPlayer = new Phonon::VideoPlayer(Phonon::VideoCategory, this);
-        m_videoPlayer->hide();

 
         controlsLayout->addWidget(m_playButton);
         controlsLayout->addWidget(m_stopButton);
         controlsLayout->addWidget(m_seekSlider);
 
 
         controlsLayout->addWidget(m_playButton);
         controlsLayout->addWidget(m_stopButton);
         controlsLayout->addWidget(m_seekSlider);
 

-        topLayout->addWidget(m_videoPlayer);
-        topLayout->addLayout(controlsLayout);
+        m_topLayout->addLayout(controlsLayout);
+
+        const int smallIconSize = IconSize(KIconLoader::Small);
+        const QSize buttonSize(smallIconSize, smallIconSize);

 
         m_playButton->setToolTip(i18n("play"));
 
         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_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->setToolTip(i18n("stop"));

-        m_stopButton->setIconSize(QSize(16, 16));
-        m_stopButton->setIcon(KIcon("media-playback-stop"));
+        m_stopButton->setIconSize(buttonSize);
+        m_stopButton->setIcon(QIcon::fromTheme(QStringLiteral("media-playback-stop")));
+        m_stopButton->setAutoRaise(true);

         m_stopButton->hide();
         m_stopButton->hide();

-        connect(m_stopButton, SIGNAL(clicked()), this, SLOT(stop()));
+        connect(m_stopButton, &QToolButton::clicked, this, &PhononWidget::stop);

 
         m_seekSlider->setIconVisible(false);
 
         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()).

     }
 }
 
     }
 }
 


@@ -131,6 +167,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();


@@ -141,51 +183,55 @@ void PhononWidget::stateChanged(Phonon::State newstate)
 
 void PhononWidget::play()
 {
 
 void PhononWidget::play()
 {

-    switch (m_mode) {
-    case Audio:
-        if (m_audioMedia == 0) {
-            // Creating an audio player 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 the play button
-            // has been pressed.
-            m_audioMedia = Phonon::createPlayer(Phonon::MusicCategory, m_url);
-            m_audioMedia->setParent(this);
-        }
-        m_media = m_audioMedia;
-        m_media->setCurrentSource(m_url);
-        break;
+    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);
+    }

 
 

-    case Video:
-        m_videoPlayer->show();
-        m_videoPlayer->play(m_url);
-        m_media = m_videoPlayer->mediaObject();
-        break;
+    if (!m_videoPlayer) {
+        m_videoPlayer = new EmbeddedVideoPlayer(this);
+        m_topLayout->insertWidget(0, m_videoPlayer);
+        Phonon::createPath(m_media, m_videoPlayer);
+        applyVideoSize();
+    }

 
 

-    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();
+void PhononWidget::slotHasVideoChanged(bool hasVideo)
+{
+    emit hasVideoChanged(hasVideo);
+
+    if (hasVideo) {
+        m_videoPlayer->show();

     }
     }

+}

 
 

-    if (m_videoPlayer != 0) {
-        m_videoPlayer->hide();
+void PhononWidget::applyVideoSize()
+{
+    if ((m_videoPlayer) && m_videoSize.isValid()) {
+        m_videoPlayer->setSizeHint(m_videoSize);

     }
 }
     }
 }

+
+#include "phononwidget.moc"