author | llornkcor <llornkcor> | 2002-10-08 21:32:13 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-10-08 21:32:13 (UTC) |
commit | ca0c224318a50c6618691fb30f39aa1d9b0b8a4f (patch) (side-by-side diff) | |
tree | 961917745cbb5bccf220735b9b62705d4651ffe7 /noncore | |
parent | 9fdf7460f752f979497ee743ba67ddba52c1a7d7 (diff) | |
download | opie-ca0c224318a50c6618691fb30f39aa1d9b0b8a4f.zip opie-ca0c224318a50c6618691fb30f39aa1d9b0b8a4f.tar.gz opie-ca0c224318a50c6618691fb30f39aa1d9b0b8a4f.tar.bz2 |
fix addAll* from menu
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidget.cpp | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp index c0d3108..d53c423 100644 --- a/noncore/multimedia/opieplayer2/playlistwidget.cpp +++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp @@ -56,8 +56,10 @@ #include "videowidget.h" extern MediaPlayerState *mediaPlayerState; +QString audioMimes ="audio/mpeg;audio/x-wav;audio/x-ogg"; +// no m3u's here please PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) : PlayListWidgetGui( parent, name, fl ) { @@ -204,9 +206,9 @@ void PlayListWidget::addToSelection( const DocLnk& lnk ) { if ( mediaPlayerState->playlist() ) { if( QFileInfo( lnk.file() ).exists() || lnk.file().left(4) == "http" ) d->selectedFiles->addToSelection( lnk ); - writeCurrentM3u(); +// writeCurrentM3u(); } else mediaPlayerState->setPlaying( TRUE ); } @@ -251,9 +253,9 @@ void PlayListWidget::playlistViewPressed( int mouse, QListViewItem *, const QPoi void PlayListWidget::addAllToList() { DocLnkSet filesAll; - Global::findDocuments(&filesAll, "video/*;audio/*"); + Global::findDocuments(&filesAll, "video/*;"+audioMimes); QListIterator<DocLnk> Adit( filesAll.children() ); for ( ; Adit.current(); ++Adit ) { if( QFileInfo( Adit.current()->file() ).exists() ) { d->selectedFiles->addToSelection( **Adit ); @@ -263,8 +265,10 @@ void PlayListWidget::addAllToList() { } void PlayListWidget::addAllMusicToList() { + if(!audioScan) + scanForAudio(); QListIterator<DocLnk> dit( files.children() ); for ( ; dit.current(); ++dit ) { if( QFileInfo(dit.current()->file() ).exists() ) { d->selectedFiles->addToSelection( **dit ); @@ -274,8 +278,10 @@ void PlayListWidget::addAllMusicToList() { } void PlayListWidget::addAllVideoToList() { + if(!videoScan) + scanForVideo(); QListIterator<DocLnk> dit( vFiles.children() ); for ( ; dit.current(); ++dit ) { if( QFileInfo( dit.current()->file() ).exists() ) { d->selectedFiles->addToSelection( **dit ); @@ -305,8 +311,10 @@ void PlayListWidget::setDocument( const QString& fileref ) { readPls( DocLnk( fileref).file() ); } else { clearList(); addToSelection( DocLnk( fileref ) ); + writeCurrentM3u(); + d->setDocumentUsed = TRUE; mediaPlayerState->setPlaying( FALSE ); mediaPlayerState->setPlaying( TRUE ); } @@ -611,9 +619,9 @@ void PlayListWidget::scanForAudio() { for ( ; sdit.current(); ++sdit ) { delete sdit.current(); } // Global::findDocuments( &files, "audio/*"); - Global::findDocuments( &files, "audio/mpeg;audio/x-wav;audio/x-ogg"); + Global::findDocuments( &files, audioMimes); audioScan = TRUE; } void PlayListWidget::scanForVideo() { @@ -843,18 +851,19 @@ void PlayListWidget::writeCurrentM3u() { qDebug("writing to current m3u"); Config cfg( "OpiePlayer" ); cfg.setGroup("PlayList"); QString currentPlaylist = cfg.readEntry("CurrentPlaylist",""); - // int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 ); + Om3u *m3uList; - m3uList = new Om3u( currentPlaylist, IO_ReadWrite |IO_Truncate ); + m3uList = new Om3u( currentPlaylist, IO_ReadWrite | IO_Truncate ); d->selectedFiles->first(); - + qDebug( d->selectedFiles->current()->file()); do { - m3uList->add( d->selectedFiles->current()->file()); + qDebug( d->selectedFiles->current()->file()); + m3uList->add( d->selectedFiles->current()->file() ); } while ( d->selectedFiles->next() ); -// qDebug( list ); + qDebug( "<<<<<<<<<<<<>>>>>>>>>>>>>>>>>" ); m3uList->write(); m3uList->close(); if(m3uList) delete m3uList; |