- 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

11 files changed, 84 insertions, 241 deletions

diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp
index 20fd1e2..1e0dc21 100644
--- a/noncore/multimedia/opieplayer2/lib.cpp
+++ b/noncore/multimedia/opieplayer2/lib.cpp
@@ -74,4 +74,2 @@ Lib::Lib( XineVideoWidget* widget )
 {
-    ThreadUtil::AutoLock lock( m_initGuard );
-    m_initialized = false;
     m_video = false;
@@ -91,15 +89,4 @@ Lib::Lib( XineVideoWidget* widget )
 
-    start();
-}
-
-void Lib::run()
-{
-    initialize();
-}
-
-void Lib::initialize()
-{
     m_xine =  xine_new( );
 
-    QString configPath = QDir::homeDirPath() + "/Settings/opiexine.cf";
     xine_config_load( m_xine, QFile::encodeName( configPath ) );
@@ -132,7 +119,2 @@ void Lib::initialize()
     xine_event_create_listener_thread (m_queue, xine_event_handler, this);
-
-    ThreadUtil::AutoLock lock( m_initGuard );
-    m_initialized = true;
-
-    send( new ThreadUtil::ChannelMessage( InitializationMessageType ), OneWay );
 }
@@ -140,6 +122,2 @@ void Lib::initialize()
 Lib::~Lib() {
-    ThreadUtil::AutoLock lock( m_initGuard );
-
-    assert( m_initialized );
-
 //    free( m_config );
@@ -158,13 +136,2 @@ Lib::~Lib() {
 
-void Lib::assertInitialized() const
-{
-    ThreadUtil::AutoLock lock( m_initGuard );
-
-    if ( m_initialized )
-        return;
-
-    qDebug( "LibXine: xine function called while not being initialized, yet! Fix the caller!" );
-    assert( m_initialized );
-}
-
 void Lib::resize ( const QSize &s ) {
@@ -195,4 +162,2 @@ int Lib::subVersion() {
 int Lib::play( const QString& fileName, int startPos, int start_time ) {
-    assertInitialized();
-
     QString str = fileName.stripWhiteSpace();
@@ -205,4 +170,2 @@ int Lib::play( const QString& fileName, int startPos, int start_time ) {
 void Lib::stop() {
-    assertInitialized();
-
     qDebug("<<<<<<<< STOP IN LIB TRIGGERED >>>>>>>");
@@ -212,4 +175,2 @@ void Lib::stop() {
 void Lib::pause( bool toggle ) {
-    assertInitialized();
-
     xine_set_param( m_stream, XINE_PARAM_SPEED, toggle ? XINE_SPEED_PAUSE : XINE_SPEED_NORMAL );
@@ -218,4 +179,2 @@ void Lib::pause( bool toggle ) {
 int Lib::speed() const {
-    assertInitialized();
-
     return  xine_get_param ( m_stream, XINE_PARAM_SPEED );
@@ -224,4 +183,2 @@ int Lib::speed() const {
 void Lib::setSpeed( int speed ) {
-    assertInitialized();
-
     xine_set_param ( m_stream, XINE_PARAM_SPEED, speed );
@@ -230,4 +187,2 @@ void Lib::setSpeed( int speed ) {
 int Lib::status() const {
-    assertInitialized();
-
     return xine_get_status( m_stream );
@@ -236,4 +191,2 @@ int Lib::status() const {
 int Lib::currentPosition() const {
-    assertInitialized();
-
     int pos, time, length;
@@ -244,4 +197,2 @@ int Lib::currentPosition() const {
 int Lib::currentTime() const {
-    assertInitialized();
-
     int pos, time, length;
@@ -252,4 +203,2 @@ int Lib::currentTime() const {
 int Lib::length() const {
-    assertInitialized();
-
       int pos, time, length;
@@ -260,4 +209,2 @@ int Lib::length() const {
 bool Lib::isSeekable() const {
-    assertInitialized();
-
     return xine_get_stream_info( m_stream, XINE_STREAM_INFO_SEEKABLE );
@@ -266,4 +213,2 @@ bool Lib::isSeekable() const {
 void Lib::seekTo( int time ) {
-    assertInitialized();
-
     //xine_trick_mode ( m_stream, XINE_TRICK_MODE_SEEK_TO_TIME, time ); NOT IMPLEMENTED YET IN XINE :_(
@@ -275,4 +220,2 @@ void Lib::seekTo( int time ) {
 Frame Lib::currentFrame() const {
-    assertInitialized();
-
     Frame frame;
@@ -282,4 +225,2 @@ Frame Lib::currentFrame() const {
 QString Lib::metaInfo( int number) const {
-    assertInitialized();
-
     return xine_get_meta_info( m_stream, number );
@@ -288,4 +229,2 @@ QString Lib::metaInfo( int number) const {
 int Lib::error() const {
-    assertInitialized();
-
     return xine_get_error( m_stream );
@@ -296,10 +235,3 @@ void Lib::receiveMessage( ThreadUtil::ChannelMessage *msg, SendType sendType )
     assert( sendType == ThreadUtil::Channel::OneWay );
-    switch ( msg->type() ) {
-        case XineMessageType:
-            handleXineEvent( static_cast<XineMessage *>( msg )->xineEvent );
-            break;
-        case InitializationMessageType:
-            emit initialized();
-            break;
-    }
+    handleXineEvent( msg->type() );
     delete msg;
@@ -308,3 +240,3 @@ void Lib::receiveMessage( ThreadUtil::ChannelMessage *msg, SendType sendType )
 void Lib::handleXineEvent( const xine_event_t* t ) {
-    send( new XineMessage( t->type ), OneWay );
+    send( new ThreadUtil::ChannelMessage( t->type ), OneWay );
 }
@@ -312,4 +244,2 @@ void Lib::handleXineEvent( const xine_event_t* t ) {
 void Lib::handleXineEvent( int type ) {
-    assertInitialized();
-
     if ( type == XINE_EVENT_UI_PLAYBACK_FINISHED ) {
@@ -321,4 +251,2 @@ void Lib::handleXineEvent( int type ) {
 void Lib::setShowVideo( bool video ) {
-    assertInitialized();
-
     m_video = video;
@@ -328,4 +256,2 @@ void Lib::setShowVideo( bool video ) {
 bool Lib::isShowingVideo() const {
-    assertInitialized();
-
     return ::null_is_showing_video( m_videoOutput );
@@ -334,4 +260,2 @@ bool Lib::isShowingVideo() const {
 bool Lib::hasVideo() const {
-    assertInitialized();
-
     return  xine_get_stream_info( m_stream, 18 );
@@ -340,4 +264,2 @@ bool Lib::hasVideo() const {
 void Lib::showVideoFullScreen( bool fullScreen ) {
-    assertInitialized();
-
     ::null_set_fullscreen( m_videoOutput, fullScreen );
@@ -346,4 +268,2 @@ void Lib::showVideoFullScreen( bool fullScreen ) {
 bool Lib::isVideoFullScreen() const {
-    assertInitialized();
-
     return ::null_is_fullscreen( m_videoOutput );
@@ -352,4 +272,2 @@ bool Lib::isVideoFullScreen() const {
 void Lib::setScaling( bool scale ) {
-    assertInitialized();
-
     ::null_set_scaling( m_videoOutput, scale );
@@ -358,4 +276,2 @@ void Lib::setScaling( bool scale ) {
 void Lib::setGamma( int value ) {
-    assertInitialized();
-
   //qDebug( QString( "%1").arg(value)  );
@@ -366,4 +282,2 @@ void Lib::setGamma( int value ) {
 bool Lib::isScaling() const {
-    assertInitialized();
-
     return ::null_is_scaling( m_videoOutput );
@@ -381,4 +295,2 @@ void Lib::xine_display_frame( void* user_data, uint8_t *frame,
 void Lib::drawFrame( uint8_t* frame,  int width,  int height,  int bytes ) {
-    assertInitialized();
-
     if ( !m_video ) {
diff --git a/noncore/multimedia/opieplayer2/lib.h b/noncore/multimedia/opieplayer2/lib.h
index 34b85b9..aba2ec9 100644
--- a/noncore/multimedia/opieplayer2/lib.h
+++ b/noncore/multimedia/opieplayer2/lib.h
@@ -57,3 +57,3 @@ namespace XINE {
     class Frame;
-    class Lib : public ThreadUtil::Channel, private ThreadUtil::Thread
+    class Lib : public ThreadUtil::Channel
     {
@@ -185,23 +185,3 @@ namespace XINE {
 
-        virtual void run();
-
     private:
-        void initialize();
-
-        void assertInitialized() const;
-
-        enum { XineMessageType = 1, InitializationMessageType };
-
-        struct XineMessage : public ThreadUtil::ChannelMessage
-        {
-            XineMessage( int _xineEvent ) : ThreadUtil::ChannelMessage( XineMessageType ),
-                xineEvent( _xineEvent )
-            {}
-
-            int xineEvent;
-        };
-
-        mutable ThreadUtil::Mutex m_initGuard;
-        bool m_initialized : 1;
-
         int m_bytes_per_pixel;
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp
index c230d6f..bbc60dd 100644
--- a/noncore/multimedia/opieplayer2/mediaplayer.cpp
+++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp
@@ -33,6 +33,5 @@ MediaPlayer::MediaPlayer( PlayListWidget &_playList, MediaPlayerState &_mediaPla
 
-    audioUI = 0;
-    videoUI = 0;
-    xineControl = 0;
-    recreateAudioAndVideoWidgets();
+    m_audioUI = 0;
+    m_videoUI = 0;
+    m_xineControl = 0;
 
@@ -62,5 +61,5 @@ MediaPlayer::MediaPlayer( PlayListWidget &_playList, MediaPlayerState &_mediaPla
 MediaPlayer::~MediaPlayer() {
-    delete xineControl;
-    delete audioUI;
-    delete videoUI;
+    delete m_xineControl;
+    delete m_audioUI;
+    delete m_videoUI;
     delete volControl;
@@ -105,3 +104,3 @@ void MediaPlayer::setPlaying( bool play ) {
     fileName = playListEntry.name;
-    xineControl->play( playListEntry.file );
+    xineControl()->play( playListEntry.file );
 
@@ -112,15 +111,15 @@ void MediaPlayer::setPlaying( bool play ) {
         fileName = QFileInfo( fileName ).baseName();
-       if ( xineControl->getMetaInfo().isEmpty() ) {
+       if ( xineControl()->getMetaInfo().isEmpty() ) {
            tickerText = tr( " File: " ) + fileName;
        } else {
-           tickerText = xineControl->getMetaInfo();
+           tickerText = xineControl()->getMetaInfo();
        }
     } else {
-        if ( xineControl->getMetaInfo().isEmpty() ) {
+        if ( xineControl()->getMetaInfo().isEmpty() ) {
             tickerText = tr( " File: " ) + fileName + tr( ", Length: " ) + time + "  ";
         } else {
-            tickerText = xineControl->getMetaInfo() + " Length: " + time + "  ";
+            tickerText = xineControl()->getMetaInfo() + " Length: " + time + "  ";
         }
     }
-    audioUI->setTickerText( tickerText );
+    audioUI()->setTickerText( tickerText );
 }
@@ -191,10 +190,10 @@ void MediaPlayer::stopChangingVolume() {
     int h=0;
-    if( !xineControl->hasVideo() ) {
-        w = audioUI->width();
-        h = audioUI->height();
-        audioUI->repaint( ( w - 200 ) / 2, h - yoff, 200 + 9, 70, FALSE );
+    if( !xineControl()->hasVideo() ) {
+        w = audioUI()->width();
+        h = audioUI()->height();
+        audioUI()->repaint( ( w - 200 ) / 2, h - yoff, 200 + 9, 70, FALSE );
     } else {
-        w = videoUI->width();
-        h = videoUI->height();
-        videoUI->repaint( ( w - 200 ) / 2, h - yoff, 200 + 9, 70, FALSE );
+        w = videoUI()->width();
+        h = videoUI()->height();
+        videoUI()->repaint( ( w - 200 ) / 2, h - yoff, 200 + 9, 70, FALSE );
     }
@@ -222,5 +221,5 @@ void MediaPlayer::timerEvent( QTimerEvent * ) {
     int w=0; int h=0;
-    if( !xineControl->hasVideo() ) {
-        w = audioUI->width();
-        h = audioUI->height();
+    if( !xineControl()->hasVideo() ) {
+        w = audioUI()->width();
+        h = audioUI()->height();
 
@@ -228,3 +227,3 @@ void MediaPlayer::timerEvent( QTimerEvent * ) {
             if ( onScreenDisplayVolume > v ) {
-                audioUI->repaint( ( w - 200 ) / 2 + v * 20 + 0, h - yoff + 40, ( onScreenDisplayVolume - v ) * 20 + 9, 30, FALSE );
+                audioUI()->repaint( ( w - 200 ) / 2 + v * 20 + 0, h - yoff + 40, ( onScreenDisplayVolume - v ) * 20 + 9, 30, FALSE );
             }
@@ -233,3 +232,3 @@ void MediaPlayer::timerEvent( QTimerEvent * ) {
         onScreenDisplayVolume = v;
-        QPainter p( audioUI );
+        QPainter p( audioUI() );
         p.setPen( QColor( 0x10, 0xD0, 0x10 ) );
@@ -251,4 +250,4 @@ void MediaPlayer::timerEvent( QTimerEvent * ) {
     } else {
-        w = videoUI->width();
-        h = videoUI->height();
+        w = videoUI()->width();
+        h = videoUI()->height();
 
@@ -256,3 +255,3 @@ void MediaPlayer::timerEvent( QTimerEvent * ) {
             if ( onScreenDisplayVolume > v ) {
-                videoUI->repaint( (w - 200) / 2 + v * 20 + 0, h - yoff + 40, ( onScreenDisplayVolume - v ) * 20 + 9, 30, FALSE );
+                videoUI()->repaint( (w - 200) / 2 + v * 20 + 0, h - yoff + 40, ( onScreenDisplayVolume - v ) * 20 + 9, 30, FALSE );
             }
@@ -261,3 +260,3 @@ void MediaPlayer::timerEvent( QTimerEvent * ) {
         onScreenDisplayVolume = v;
-        QPainter p( videoUI );
+        QPainter p( videoUI() );
         p.setPen( QColor( 0x10, 0xD0, 0x10 ) );
@@ -348,23 +347,42 @@ void MediaPlayer::cleanUp() {// this happens on closing
 
-void MediaPlayer::recreateAudioAndVideoWidgets()
+void MediaPlayer::recreateAudioAndVideoWidgets() const
 {
-    delete xineControl;
-    delete audioUI;
-    delete videoUI;
-    audioUI = new AudioWidget( playList, mediaPlayerState, 0, "audioUI" );
-    videoUI = new VideoWidget( playList, mediaPlayerState, 0, "videoUI" );
-
-    connect( audioUI,  SIGNAL( moreClicked() ), this, SLOT( startIncreasingVolume() ) );
-    connect( audioUI,  SIGNAL( lessClicked() ),  this, SLOT( startDecreasingVolume() ) );
-    connect( audioUI,  SIGNAL( moreReleased() ), this, SLOT( stopChangingVolume() ) );
-    connect( audioUI,  SIGNAL( lessReleased() ), this, SLOT( stopChangingVolume() ) );
-
-    connect( videoUI,  SIGNAL( moreClicked() ), this, SLOT( startIncreasingVolume() ) );
-    connect( videoUI,  SIGNAL( lessClicked() ),  this, SLOT( startDecreasingVolume() ) );
-    connect( videoUI,  SIGNAL( moreReleased() ), this, SLOT( stopChangingVolume() ) );
-    connect( videoUI,  SIGNAL( lessReleased() ), this, SLOT( stopChangingVolume() ) );
-
-    xineControl = new XineControl( videoUI->vidWidget(), mediaPlayerState );
-    connect( xineControl, SIGNAL( initialized() ),
-             &mediaPlayerState, SLOT( setBackendInitialized() ) );
+    delete m_xineControl;
+    delete m_audioUI;
+    delete m_videoUI;
+    m_audioUI = new AudioWidget( playList, mediaPlayerState, 0, "audioUI" );
+    m_videoUI = new VideoWidget( playList, mediaPlayerState, 0, "videoUI" );
+
+    connect( m_audioUI,  SIGNAL( moreClicked() ), this, SLOT( startIncreasingVolume() ) );
+    connect( m_audioUI,  SIGNAL( lessClicked() ),  this, SLOT( startDecreasingVolume() ) );
+    connect( m_audioUI,  SIGNAL( moreReleased() ), this, SLOT( stopChangingVolume() ) );
+    connect( m_audioUI,  SIGNAL( lessReleased() ), this, SLOT( stopChangingVolume() ) );
+
+    connect( m_videoUI,  SIGNAL( moreClicked() ), this, SLOT( startIncreasingVolume() ) );
+    connect( m_videoUI,  SIGNAL( lessClicked() ),  this, SLOT( startDecreasingVolume() ) );
+    connect( m_videoUI,  SIGNAL( moreReleased() ), this, SLOT( stopChangingVolume() ) );
+    connect( m_videoUI,  SIGNAL( lessReleased() ), this, SLOT( stopChangingVolume() ) );
+
+    m_xineControl = new XineControl( m_videoUI->vidWidget(), mediaPlayerState );
+}
+
+AudioWidget *MediaPlayer::audioUI() const
+{
+    if ( !m_audioUI )
+        recreateAudioAndVideoWidgets();
+    return m_audioUI;
+}
+
+VideoWidget *MediaPlayer::videoUI() const
+{
+    if ( !m_videoUI )
+        recreateAudioAndVideoWidgets();
+    return m_videoUI;
+}
+
+XineControl *MediaPlayer::xineControl() const
+{
+    if ( !m_xineControl )
+        recreateAudioAndVideoWidgets();
+    return m_xineControl;
 }
@@ -373,4 +391,4 @@ void MediaPlayer::reloadSkins()
 {
-    audioUI->loadSkin();
-    videoUI->loadSkin();
+    audioUI()->loadSkin();
+    videoUI()->loadSkin();
 }
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;
 };
diff --git a/noncore/multimedia/opieplayer2/mediaplayerstate.cpp b/noncore/multimedia/opieplayer2/mediaplayerstate.cpp
index d54d870..40fa1a4 100644
--- a/noncore/multimedia/opieplayer2/mediaplayerstate.cpp
+++ b/noncore/multimedia/opieplayer2/mediaplayerstate.cpp
@@ -55,3 +55,2 @@ MediaPlayerState::MediaPlayerState( QObject *parent, const char *name )
     seekable = true;
-    backendInitialized = false;
 }
@@ -88,14 +87,2 @@ void MediaPlayerState::writeConfig( Config& cfg ) const {
 
-bool MediaPlayerState::isInitialized() const
-{
-    return backendInitialized; // for now, more to come (skin stuff)
-}
-
-void MediaPlayerState::setBackendInitialized()
-{
-    assert( backendInitialized == false );
-    backendInitialized = true;
-    emit initialized();
-}
-
 MediaPlayerState::DisplayType MediaPlayerState::displayType() const
diff --git a/noncore/multimedia/opieplayer2/mediaplayerstate.h b/noncore/multimedia/opieplayer2/mediaplayerstate.h
index 6fe6d76..7408fdc 100644
--- a/noncore/multimedia/opieplayer2/mediaplayerstate.h
+++ b/noncore/multimedia/opieplayer2/mediaplayerstate.h
@@ -63,3 +63,2 @@ public:
     bool isStopped() const { return stopped; }
-    bool isInitialized() const;
     long position() const { return curPosition; }
@@ -100,4 +99,2 @@ public slots:
 
-    void setBackendInitialized();
-
 signals:
@@ -120,4 +117,2 @@ signals:
 
-    void initialized();
-
 private:
@@ -134,3 +129,2 @@ private:
     bool stopped : 1;
-    bool backendInitialized : 1;
     long curPosition;
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index 8e4f56d..c35e03d 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -67,3 +67,3 @@ PlayListWidget::PlayListWidget( MediaPlayerState &mediaPlayerState, QWidget* par
                                           this , SLOT(removeSelected() ) );
-    d->tbPlay    = new PlayButton( mediaPlayerState, bar, tr( "Play" ), "opieplayer2/play",
+    d->tbPlay    = new ToolButton( bar, tr( "Play" ), "opieplayer2/play",
                                    this , SLOT( btnPlay( bool) ), TRUE );
diff --git a/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp b/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp
index 23b7a70..5fc0c39 100644
--- a/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp
@@ -205,24 +205,2 @@ void PlayListWidgetGui::setActiveWindow()  {
 
-PlayButton::PlayButton( MediaPlayerState &_mediaPlayerState, QWidget *parent, const char *name,
-                        const QString &icon, QObject *handler, const QString &slot, bool t )
-    : ToolButton( parent, name, icon, handler, slot, t ), mediaPlayerState( _mediaPlayerState ),
-      m_lastEnableStatus( true )
-{
-    connect( &mediaPlayerState, SIGNAL( initialized() ),
-             this, SLOT( checkInitializationStatus() ) );
-}
-
-void PlayButton::setEnabled( bool enable )
-{
-    m_lastEnableStatus = enable;
-
-    enable &= mediaPlayerState.isInitialized();
-
-    ToolButton::setEnabled( enable );
-}
-
-void PlayButton::checkInitializationStatus()
-{
-    setEnabled( m_lastEnableStatus );
-}
 
diff --git a/noncore/multimedia/opieplayer2/playlistwidgetgui.h b/noncore/multimedia/opieplayer2/playlistwidgetgui.h
index 1aa8ac8..c965b0d 100644
--- a/noncore/multimedia/opieplayer2/playlistwidgetgui.h
+++ b/noncore/multimedia/opieplayer2/playlistwidgetgui.h
@@ -86,20 +86,2 @@ public:
 
-class PlayButton : public ToolButton
-{
-    Q_OBJECT
-public:
-    PlayButton( MediaPlayerState &_mediaPlayerState, QWidget *parent, const char *name, 
-                const QString& icon, QObject *handler, const QString& slot, bool t = FALSE );
-
-protected:
-    virtual void setEnabled( bool enable );
-
-private slots:
-    void checkInitializationStatus();
-
-private:
-    MediaPlayerState &mediaPlayerState;
-    bool m_lastEnableStatus : 1;
-};
-
 class MenuItem : public QAction {
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.cpp b/noncore/multimedia/opieplayer2/xinecontrol.cpp
index e791c3b..ee2cd83 100644
--- a/noncore/multimedia/opieplayer2/xinecontrol.cpp
+++ b/noncore/multimedia/opieplayer2/xinecontrol.cpp
@@ -57,3 +57,3 @@ XineControl::XineControl( XineVideoWidget *xineWidget,
     connect( libXine, SIGNAL( stopped() ), this, SLOT( nextMedia() ) );
-    connect( libXine, SIGNAL( initialized() ), this, SLOT( xineInitialized() ) );
+    connect( xineVideoWidget, SIGNAL( videoResized( const QSize & ) ), this, SLOT( videoResized ( const QSize & ) ) );
 
@@ -128,10 +128,2 @@ void XineControl::setGamma( int value ) {
 
-void XineControl::xineInitialized()
-{
-    connect( xineVideoWidget, SIGNAL( videoResized( const QSize & ) ), this, SLOT( videoResized ( const QSize & ) ) );
-    libXine->resize( xineVideoWidget->videoSize() );
-
-    emit initialized();
-}
-
 void XineControl::stop( bool isSet ) {
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.h b/noncore/multimedia/opieplayer2/xinecontrol.h
index 085de3f..fdc5d2b 100644
--- a/noncore/multimedia/opieplayer2/xinecontrol.h
+++ b/noncore/multimedia/opieplayer2/xinecontrol.h
@@ -102,6 +102,2 @@ public slots:
 
-
-private slots:
-    void xineInitialized();
-
 private:
@@ -120,4 +116,2 @@ signals:
     void positionChanged( long );
-
-    void initialized();
 };