- Postpone the video player initialization until the play button has been pressed.

- Assure that the video player has the same size as the preview widget. Convincing the embedded video player to dynamically resize during playing a video seems to be impossible - I need to check the Phonon::VideoPlayer source code to get the root cause for the currently strange behavior :-(

svn path=/trunk/KDE/kdebase/apps/; revision=958332

1 files changed, 14 insertions, 1 deletions

diff --git a/src/panels/information/phononwidget.h b/src/panels/information/phononwidget.h
index daea8b1cc..196b87f87 100644
--- a/src/panels/information/phononwidget.h
+++ b/src/panels/information/phononwidget.h
@@ -23,6 +23,7 @@
 
 #include <kurl.h>
 
+#include <QtCore/QSize>
 #include <QtGui/QWidget>
 
 #include <Phonon/Global>
@@ -34,7 +35,9 @@ namespace Phonon
     class VideoPlayer;
 } // namespace Phonon
 
+class EmbeddedVideoPlayer;
 class QToolButton;
+class QVBoxLayout;
 
 class PhononWidget : public QWidget
 {
@@ -54,6 +57,9 @@ class PhononWidget : public QWidget
         void setMode(Mode mode);
         Mode mode() const;
 
+        void setVideoSize(const QSize& size);
+        QSize videoSize() const;
+
     signals:
         void playingStarted();
         void playingStopped();
@@ -68,14 +74,21 @@ class PhononWidget : public QWidget
         void stop();
 
     private:
+        void applyVideoSize();
+
+    private:
         Mode m_mode;
         KUrl m_url;
+        QSize m_videoSize;
+
         QToolButton *m_playButton;
         QToolButton *m_stopButton;
+
+        QVBoxLayout *m_topLayout;
         Phonon::MediaObject *m_audioMedia;
         Phonon::MediaObject *m_media;
         Phonon::SeekSlider *m_seekSlider;
-        Phonon::VideoPlayer *m_videoPlayer;
+        EmbeddedVideoPlayer *m_videoPlayer;
 };
 
 #endif // PHONONWIDGET_H