- roll back the threaded xine initialization, the mediaplayer initialization

  state and the PlayButton change set
- instead load the audio-/video widget and the xine control on-demand. much
  faster and much simpler for startup

1 files changed, 10 insertions, 4 deletions

diff --git a/noncore/multimedia/opieplayer2/mediaplayer.h b/noncore/multimedia/opieplayer2/mediaplayer.h
index 6b316f6..5975731 100644
--- a/noncore/multimedia/opieplayer2/mediaplayer.h
+++ b/noncore/multimedia/opieplayer2/mediaplayer.h
@@ -56,3 +56,2 @@ public:
 public slots:
-    void recreateAudioAndVideoWidgets();
     void reloadSkins();
@@ -74,3 +73,7 @@ protected:
     void keyReleaseEvent( QKeyEvent *e);
+
 private:
+    AudioWidget *audioUI() const;
+    VideoWidget *videoUI() const;
+    XineControl *xineControl() const;
 
@@ -79,3 +82,2 @@ private:
     int     volumeDirection;
-    XineControl *xineControl;
     VolumeControl *volControl;
@@ -83,4 +85,8 @@ private:
     PlayListWidget &playList;
-    AudioWidget *audioUI;
-    VideoWidget *videoUI;
+
+    void recreateAudioAndVideoWidgets() const;
+
+    mutable XineControl *m_xineControl;
+    mutable AudioWidget *m_audioUI;
+    mutable VideoWidget *m_videoUI;
 };