fix coredump on exit

3 files changed, 8 insertions, 8 deletions

diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp
index 0526c2a..5503705 100644
--- a/noncore/multimedia/opieplayer2/mediaplayer.cpp
+++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp
@@ -200,102 +200,102 @@ void MediaPlayer::timerEvent( QTimerEvent * ) {
             if ( onScreenDisplayVolume > v ) {
                 audioUI->repaint( (w - 200) / 2 + v * 20 + 0, h - yoff + 40, (onScreenDisplayVolume - v) * 20 + 9, 30, FALSE );
             }
         }
         drawnOnScreenDisplay = TRUE;
         onScreenDisplayVolume = v;
         QPainter p( audioUI );
         p.setPen( QColor( 0x10, 0xD0, 0x10 ) );
         p.setBrush( QColor( 0x10, 0xD0, 0x10 ) );
 
         QFont f;
         f.setPixelSize( 20 );
         f.setBold( TRUE );
         p.setFont( f );
         p.drawText( (w - 200) / 2, h - yoff + 20, tr("Volume") );
 
         for ( unsigned int i = 0; i < 10; i++ ) {
             if ( v > i ) {
                 p.drawRect( (w - 200) / 2 + i * 20 + 0, h - yoff + 40, 9, 30 );
             } else {
                 p.drawRect( (w - 200) / 2 + i * 20 + 3, h - yoff + 50, 3, 10 );
             }
         }
     } else {
         w = videoUI->width();
         h = videoUI->height();
 
         if ( drawnOnScreenDisplay ) {
             if ( onScreenDisplayVolume > v ) {
                 videoUI->repaint( (w - 200) / 2 + v * 20 + 0, h - yoff + 40, (onScreenDisplayVolume - v) * 20 + 9, 30, FALSE );
             }
         }
         drawnOnScreenDisplay = TRUE;
         onScreenDisplayVolume = v;
         QPainter p( videoUI );
         p.setPen( QColor( 0x10, 0xD0, 0x10 ) );
         p.setBrush( QColor( 0x10, 0xD0, 0x10 ) );
 
         QFont f;
         f.setPixelSize( 20 );
         f.setBold( TRUE );
         p.setFont( f );
         p.drawText( (w - 200) / 2, h - yoff + 20, tr("Volume") );
 
         for ( unsigned int i = 0; i < 10; i++ ) {
             if ( v > i ) {
                 p.drawRect( (w - 200) / 2 + i * 20 + 0, h - yoff + 40, 9, 30 );
             } else {
                 p.drawRect( (w - 200) / 2 + i * 20 + 3, h - yoff + 50, 3, 10 );
             }
         }
     }
 }
 
 
 void MediaPlayer::blank( bool b ) {
     fd=open("/dev/fb0",O_RDWR);
     if (fd != -1) {
         if ( b ) {
             qDebug("do blanking");
             ioctl( fd, FBIOBLANK, 3 );
             isBlanked = TRUE;
         } else {
             qDebug("do unblanking");
             ioctl( fd, FBIOBLANK, 0);
             isBlanked = FALSE;
         }
         close( fd );
     } else {
         qDebug("<< /dev/fb0 could not be opened  >>");
     }
 }
 
 void MediaPlayer::keyReleaseEvent( QKeyEvent *e) {
     switch ( e->key() ) {
 ////////////////////////////// Zaurus keys
       case Key_Home:
           break;
       case Key_F9: //activity
           break;
       case Key_F10: //contacts
           break;
       case Key_F11: //menu
           break;
       case Key_F12: //home
           qDebug("Blank here");
 //          mediaPlayerState->toggleBlank();
           break;
       case Key_F13: //mail
           qDebug("Blank here");
           //  mediaPlayerState->toggleBlank();
           break;
     }
 }
 
 void MediaPlayer::cleanUp() {// this happens on closing
-    Config cfg( "OpiePlayer" );
-    playList->writeConfig( cfg );
+     Config cfg( "OpiePlayer" );
+     playList->writeConfig( cfg );
     
 //     QPEApplication::grabKeyboard();
 //     QPEApplication::ungrabKeyboard();
 }
diff --git a/noncore/multimedia/opieplayer2/mediaplayerstate.cpp b/noncore/multimedia/opieplayer2/mediaplayerstate.cpp
index eaedaa5..d984022 100644
--- a/noncore/multimedia/opieplayer2/mediaplayerstate.cpp
+++ b/noncore/multimedia/opieplayer2/mediaplayerstate.cpp
@@ -1,121 +1,121 @@
 #include <qpe/qpeapplication.h>
 #include <qpe/qlibrary.h>
 #include <qpe/config.h>
 #include <qvaluelist.h>
 #include <qobject.h>
 #include <qdir.h>
 #include "mediaplayerstate.h"
 
 
 
 //#define MediaPlayerDebug(x) qDebug x
 #define MediaPlayerDebug(x)
 
 
 MediaPlayerState::MediaPlayerState( QObject *parent, const char *name )
         : QObject( parent, name ) {
     Config cfg( "OpiePlayer" );
     readConfig( cfg );
     isStreaming = false;
 }
 
 
 MediaPlayerState::~MediaPlayerState() {
-    Config cfg( "OpiePlayer" );
-    writeConfig( cfg );
+//     Config cfg( "OpiePlayer" );
+//     writeConfig( cfg );
 
 }
 
 
 void MediaPlayerState::readConfig( Config& cfg ) {
     cfg.setGroup("Options");
     isFullscreen = cfg.readBoolEntry( "FullScreen" );
     isScaled = cfg.readBoolEntry( "Scaling" );
     isLooping = cfg.readBoolEntry( "Looping" );
     isShuffled = cfg.readBoolEntry( "Shuffle" );
     usePlaylist = cfg.readBoolEntry( "UsePlayList" );
     usePlaylist = TRUE;
     isPlaying = FALSE;
     isStreaming = FALSE;
     isPaused = FALSE;
     curPosition = 0;
     curLength = 0;
     curView = 'l';
 }
 
 
 void MediaPlayerState::writeConfig( Config& cfg ) const {
     cfg.setGroup("Options");
     cfg.writeEntry("FullScreen", isFullscreen );
     cfg.writeEntry("Scaling", isScaled );
     cfg.writeEntry("Looping", isLooping );
     cfg.writeEntry("Shuffle", isShuffled );
     cfg.writeEntry("UsePlayList", usePlaylist );
 }
 
 
 // public stuff
 
 
 bool MediaPlayerState::streaming() {
     return isStreaming;
 }
 
 bool MediaPlayerState::fullscreen() {
     return isFullscreen;
 }
 
 bool MediaPlayerState::scaled() {
     return isScaled;
 }
 
 bool MediaPlayerState::looping() {
     return isLooping;
 }
 
 bool MediaPlayerState::shuffled() {
     return isShuffled;
 }
 
 
 bool MediaPlayerState:: playlist() {
     return usePlaylist;
 }
 
 bool MediaPlayerState::paused() {
     return isPaused;
 }
 
 bool MediaPlayerState::playing() {
     return isPlaying;
 }
 
 bool MediaPlayerState::stop() {
     return isStoped;
 }
 
 long MediaPlayerState::position() {
     return curPosition;
 }
 
 long MediaPlayerState::length() {
     return curLength;
 }
 
 char MediaPlayerState::view() {
     return curView;
 }
 
 // slots
 void MediaPlayerState::setIsStreaming( bool b ) {
 
     if ( isStreaming == b ) {
         return;
     }
     isStreaming = b;
 }
 
 
 void MediaPlayerState::setFullscreen( bool b ) {
     if ( isFullscreen == b ) {
         return;
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index bc9b166..75e2979 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -214,196 +214,196 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
   audioView = new QListView( aTab, "Audioview" );
   audioView->addColumn( tr("Title"),140);
   audioView->addColumn(tr("Size"), -1);
   audioView->addColumn(tr("Media"),-1);
   audioView->setColumnAlignment(1, Qt::AlignRight);
   audioView->setColumnAlignment(2, Qt::AlignRight);
   audioView->setAllColumnsShowFocus(TRUE);
   audioView->setSorting(0,TRUE);
 
   audioView->setMultiSelection( TRUE );
   audioView->setSelectionMode( QListView::Extended);
 
   Alayout->addMultiCellWidget( audioView, 0, 0, 0, 1 );
 
   tabWidget->insertTab(aTab,tr("Audio"));
 
   QPEApplication::setStylusOperation( audioView->viewport(),QPEApplication::RightOnHold);
 
   QWidget *vTab;
   vTab = new QWidget( tabWidget, "vTab" );
 
   QGridLayout *Vlayout = new QGridLayout( vTab );
   Vlayout->setSpacing( 2);
   Vlayout->setMargin( 2);
 
   videoView = new QListView( vTab, "Videoview" );
 
   videoView->addColumn(tr("Title"),140);
   videoView->addColumn(tr("Size"),-1);
   videoView->addColumn(tr("Media"),-1);
   videoView->setColumnAlignment(1, Qt::AlignRight);
   videoView->setColumnAlignment(2, Qt::AlignRight);
   videoView->setAllColumnsShowFocus(TRUE);
   videoView->setSorting(0,TRUE);
 
   videoView->setMultiSelection( TRUE );
   videoView->setSelectionMode( QListView::Extended);
 
   Vlayout->addMultiCellWidget( videoView, 0, 0, 0, 1 );
 
   QPEApplication::setStylusOperation( videoView->viewport(),QPEApplication::RightOnHold);
 
   tabWidget->insertTab( vTab,tr("Video"));
 
   //playlists list
   QWidget *LTab;
   LTab = new QWidget( tabWidget, "LTab" );
   QGridLayout *Llayout = new QGridLayout( LTab );
   Llayout->setSpacing( 2);
   Llayout->setMargin( 2);
 
   playLists = new FileSelector( "playlist/plain", LTab, "fileselector" , FALSE, FALSE); //buggy
   Llayout->addMultiCellWidget( playLists, 0, 0, 0, 1 );
 
   tabWidget->insertTab(LTab,tr("Lists"));
 
   connect(tbDeletePlaylist,(SIGNAL(released())),SLOT( deletePlaylist()));
 
   connect( pmView, SIGNAL( activated(int)), this, SLOT( pmViewActivated(int) ) );
 
   connect( skinsMenu, SIGNAL( activated(int)), this, SLOT(skinsMenuActivated(int) ) );
 
   //    connect( scaleButton, SIGNAL(activated()), mediaPlayerState, SLOT(toggleScaled() ) );
 
   connect( d->selectedFiles, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
            this,SLOT( playlistViewPressed(int, QListViewItem *, const QPoint&, int)) );
   connect( audioView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
            this,SLOT( viewPressed(int, QListViewItem *, const QPoint&, int)) );
   connect( audioView, SIGNAL( returnPressed( QListViewItem *)),
            this,SLOT( playIt( QListViewItem *)) );
   connect( audioView, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( addToSelection( QListViewItem *) ) );
   connect( videoView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
            this,SLOT( viewPressed(int, QListViewItem *, const QPoint&, int)) );
   connect( videoView, SIGNAL( returnPressed( QListViewItem *)),
            this,SLOT( playIt( QListViewItem *)) );
   connect( videoView, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( addToSelection( QListViewItem *) ) );
   connect( playLists, SIGNAL( fileSelected( const DocLnk &) ), this, SLOT( loadList( const DocLnk & ) ) );
   connect( tabWidget, SIGNAL (currentChanged(QWidget*)),this,SLOT(tabChanged(QWidget*)));
   connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ),    d->tbPlay,    SLOT( setOn( bool ) ) );
   connect( mediaPlayerState, SIGNAL( loopingToggled( bool ) ),    d->tbLoop,    SLOT( setOn( bool ) ) );
   connect( mediaPlayerState, SIGNAL( shuffledToggled( bool ) ),   d->tbShuffle, SLOT( setOn( bool ) ) );
   connect( mediaPlayerState, SIGNAL( playlistToggled( bool ) ),   this,         SLOT( setPlaylist( bool ) ) );
   connect( d->selectedFiles, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( playIt( QListViewItem *) ) );
 
   setCentralWidget( vbox5 );
 
   readConfig( cfg );
   QString currentPlaylist = cfg.readEntry("CurrentPlaylist","");
   loadList(DocLnk( currentPlaylist));
   setCaption(tr("OpiePlayer: ")+ currentPlaylist );
 
   initializeStates();
 }
 
 
 PlayListWidget::~PlayListWidget() {
-  if ( d->current ) {
-    delete d->current;
-  }
-  delete d;
+   if ( d->current ) {
+     delete d->current;
+   }
+   delete d;
 }
 
 
 void PlayListWidget::initializeStates() {
 
   d->tbPlay->setOn( mediaPlayerState->playing() );
   d->tbLoop->setOn( mediaPlayerState->looping() );
   d->tbShuffle->setOn( mediaPlayerState->shuffled() );
   setPlaylist( true);
 }
 
 
 void PlayListWidget::readConfig( Config& cfg ) {
   cfg.setGroup("PlayList");
   QString currentString = cfg.readEntry("current", "" );
   int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 );
   for ( int i = 0; i < noOfFiles; i++ ) {
     QString entryName;
     entryName.sprintf( "File%i", i + 1 );
     QString linkFile = cfg.readEntry( entryName );
     if(QFileInfo( linkFile).exists() ) {
       DocLnk lnk( linkFile );
       if ( QFileInfo( lnk.file()).exists() || linkFile.find("http",0,TRUE) != -1) {
         d->selectedFiles->addToSelection( lnk );
       }
     }
   }
   d->selectedFiles->setSelectedItem( currentString);
 }
 
 
 void PlayListWidget::writeConfig( Config& cfg ) const {
 
   d->selectedFiles->writeCurrent( cfg);
   cfg.setGroup("PlayList");
   int noOfFiles = 0;
   d->selectedFiles->first();
   do {
     const DocLnk *lnk = d->selectedFiles->current();
     if ( lnk ) {
       QString entryName;
       entryName.sprintf( "File%i", noOfFiles + 1 );
       cfg.writeEntry( entryName, lnk->linkFile() );
       // if this link does exist, add it so we have the file
       // next time...
       if ( !QFile::exists( lnk->linkFile() ) ) {
         // the way writing lnks doesn't really check for out
         // of disk space, but check it anyway.
         if ( !lnk->writeLink() ) {
           QMessageBox::critical( 0, tr("Out of space"),
                                  tr( "There was a problem saving "
                                      "the playlist.\n"
                                      "Your playlist "
                                      "may be missing some entries\n"
                                      "the next time you start it." )
                                  );
         }
       }
       noOfFiles++;
     }
   }
   while ( d->selectedFiles->next() );
   cfg.writeEntry("NumberOfFiles", noOfFiles );
 }
 
 
 void PlayListWidget::addToSelection( const DocLnk& lnk ) {
   d->setDocumentUsed = FALSE;
   if ( mediaPlayerState->playlist() ) {
     if(QFileInfo(lnk.file()).exists() || lnk.file().left(4) == "http" )
       d->selectedFiles->addToSelection( lnk );
   }
   else
     mediaPlayerState->setPlaying( TRUE );
 }
 
 
 void PlayListWidget::clearList() {
   while ( first() ) {
     d->selectedFiles->removeSelected();
   }
 }
 
 
 void PlayListWidget::addAllToList() {
   DocLnkSet filesAll;
   Global::findDocuments(&filesAll, "video/*;audio/*");
   QListIterator<DocLnk> Adit( filesAll.children() );
   for ( ; Adit.current(); ++Adit ) {
     if(QFileInfo(Adit.current()->file()).exists()) {
       d->selectedFiles->addToSelection( **Adit );
     }
   }
 }