added 'initialzing' message to caption, until after xine is initialized

2 files changed, 7 insertions, 3 deletions

diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp
index 0f8242b..6a48b82 100644
--- a/noncore/multimedia/opieplayer2/mediaplayer.cpp
+++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp
@@ -29,16 +29,18 @@ extern PlayListWidget *playList;
 extern MediaPlayerState *mediaPlayerState;
 
 
 #define FBIOBLANK             0x4611
 
 MediaPlayer::MediaPlayer( QObject *parent, const char *name )
     : QObject( parent, name ), volumeDirection( 0 ), currentFile( NULL ) {
 
+    playList->setCaption(tr("OpiePlayer: Initializating"));
+    
     qApp->processEvents();
     //    QPEApplication::grabKeyboard(); // EVIL
     connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
 
     connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( setPlaying( bool ) ) );
 
     connect( mediaPlayerState, SIGNAL( pausedToggled( bool ) ),  this, SLOT( pauseCheck( bool ) ) );
 
@@ -53,16 +55,17 @@ MediaPlayer::MediaPlayer( QObject *parent, const char *name )
 
     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() ) );
 
     volControl = new VolumeControl;
     xineControl = new XineControl();
+    playList->setCaption(tr("OpiePlayer"));
 }
 
 MediaPlayer::~MediaPlayer() {
     delete xineControl;
     delete volControl;
 }
 
 void MediaPlayer::pauseCheck( bool b ) {
@@ -258,17 +261,17 @@ void MediaPlayer::blank( bool b ) {
             isBlanked = TRUE;
         } else {
             qDebug("do unblanking");
             ioctl( fd, FBIOBLANK, 0);
             isBlanked = FALSE;
         }
         close( fd );
     } else {
-        qDebug("<< /dev/fb0 could not be opend  >>");
+        qDebug("<< /dev/fb0 could not be opened  >>");
     }
 }
 
 void MediaPlayer::keyReleaseEvent( QKeyEvent *e) {
     switch ( e->key() ) {
 ////////////////////////////// Zaurus keys
       case Key_Home:
           break;
@@ -284,12 +287,13 @@ void MediaPlayer::keyReleaseEvent( QKeyEvent *e) {
           break;
       case Key_F13: //mail
           qDebug("Blank here");
           //  mediaPlayerState->toggleBlank();
           break;
     }
 }
 
-void MediaPlayer::cleanUp() {
+void MediaPlayer::cleanUp() {// this happens on closing
+    
 //     QPEApplication::grabKeyboard();
 //     QPEApplication::ungrabKeyboard();
 }
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index 251c2e5..5c804f5 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -94,17 +94,17 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
   d->current = NULL;
   fromSetDocument = FALSE;
   insanityBool=FALSE;
   audioScan = FALSE;
   videoScan = FALSE;
 
   setBackgroundMode( PaletteButton );
 
-  setCaption( tr("OpiePlayer") );
+//  setCaption( tr("OpiePlayer") );
   setIcon( Resource::loadPixmap( "opieplayer2/MPEGPlayer" ) );
 
   setToolBarsMovable( FALSE );
 
   // Create Toolbar
   QPEToolBar *toolbar = new QPEToolBar( this );
   toolbar->setHorizontalStretchable( TRUE );