author | llornkcor <llornkcor> | 2002-10-10 01:20:36 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-10-10 01:20:36 (UTC) |
commit | 2cbc91d6aff15c931426f3c835b5126c7da3ba2b (patch) (side-by-side diff) | |
tree | 65d6cf3c96306ccbb55c44c5d21af3777835b134 /noncore/multimedia/opieplayer2 | |
parent | 41aaa97e19b29f96fced9013a707cc6d16bc2143 (diff) | |
download | opie-2cbc91d6aff15c931426f3c835b5126c7da3ba2b.zip opie-2cbc91d6aff15c931426f3c835b5126c7da3ba2b.tar.gz opie-2cbc91d6aff15c931426f3c835b5126c7da3ba2b.tar.bz2 |
other crash fixes
Diffstat (limited to 'noncore/multimedia/opieplayer2') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/om3u.cpp | 11 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidget.cpp | 14 |
2 files changed, 13 insertions, 12 deletions
diff --git a/noncore/multimedia/opieplayer2/om3u.cpp b/noncore/multimedia/opieplayer2/om3u.cpp index 0be727b..039f3b1 100644 --- a/noncore/multimedia/opieplayer2/om3u.cpp +++ b/noncore/multimedia/opieplayer2/om3u.cpp @@ -49,17 +49,11 @@ //extern PlayListWidget *playList; Om3u::Om3u( const QString &filePath, int mode) : QStringList (){ -//filePath is path name to m3u //qDebug("<<<<<<<new m3u "+filePath); f.setName(filePath); -// if(f.exists()) -// f.open( IO_ReadWrite); -// else -// f.open( IO_ReadWrite | IO_Truncate); f.open(mode); - } Om3u::~Om3u(){} @@ -131,13 +125,15 @@ void Om3u::readPls() { //it's a pls file } void Om3u::write() { //writes list to m3u file QString list; + if(count()>0) { for ( QStringList::ConstIterator it = begin(); it != end(); ++it ) { qDebug(*it); list += *it+"\n"; } f.writeBlock( list, list.length() ); + } // f.close(); } void Om3u::add(const QString &filePath) { //adds to m3u file @@ -145,17 +141,18 @@ void Om3u::add(const QString &filePath) { //adds to m3u file } void Om3u::remove(const QString &filePath) { //removes from m3u list QString list, currentFile; + if(count()>0) { for ( QStringList::ConstIterator it = begin(); it != end(); ++it ) { currentFile=*it; // qDebug(*it); if( filePath != currentFile) list += currentFile+"\n"; } f.writeBlock( list, list.length() ); - + } } void Om3u::deleteFile(const QString &filePath) {//deletes m3u file f.close(); diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp index e28efd0..f9192e8 100644 --- a/noncore/multimedia/opieplayer2/playlistwidget.cpp +++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp @@ -186,10 +186,10 @@ void PlayListWidget::writeDefaultPlaylist() { QString currentString = config.readEntry( "CurrentPlaylist", filename); if( currentString == filename) { Om3u *m3uList; // qDebug("<<<<<<<<<<<<<default>>>>>>>>>>>>>>>>>>>"); + if( d->selectedFiles->first() ) { m3uList = new Om3u(filename, IO_ReadWrite | IO_Truncate); - d->selectedFiles->first(); do { // qDebug(d->selectedFiles->current()->file()); m3uList->add( d->selectedFiles->current()->file() ); } @@ -197,8 +197,10 @@ void PlayListWidget::writeDefaultPlaylist() { m3uList->write(); m3uList->close(); if(m3uList) delete m3uList; + + } } } void PlayListWidget::addToSelection( const DocLnk& lnk ) { @@ -852,11 +854,13 @@ void PlayListWidget::writeCurrentM3u() { Config cfg( "OpiePlayer" ); cfg.setGroup("PlayList"); QString currentPlaylist = cfg.readEntry("CurrentPlaylist",""); + if( d->selectedFiles->first()) { Om3u *m3uList; m3uList = new Om3u( currentPlaylist, IO_ReadWrite | IO_Truncate ); - d->selectedFiles->first(); + + qDebug( d->selectedFiles->current()->file()); do { qDebug( d->selectedFiles->current()->file()); m3uList->add( d->selectedFiles->current()->file() ); @@ -867,8 +871,9 @@ void PlayListWidget::writeCurrentM3u() { m3uList->close(); if(m3uList) delete m3uList; } +} /* writes current playlist to m3u file */ void PlayListWidget::writem3u() { @@ -889,12 +894,11 @@ void PlayListWidget::writem3u() { if( name.right( 3 ) != "m3u" ) { filename = QPEApplication::documentDir() + "/" +name+".m3u"; } + if( d->selectedFiles->first()) { m3uList = new Om3u(filename, IO_ReadWrite); - d->selectedFiles->first(); - do { m3uList->add( d->selectedFiles->current()->file()); } while ( d->selectedFiles->next() ); @@ -922,9 +926,9 @@ void PlayListWidget::writem3u() { } setCaption(tr("OpiePlayer: ") + name); } - + } } void PlayListWidget::keyReleaseEvent( QKeyEvent *e ) { switch ( e->key() ) { |