-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 @@ | |||
56 | #include "videowidget.h" | 56 | #include "videowidget.h" |
57 | 57 | ||
58 | extern MediaPlayerState *mediaPlayerState; | 58 | extern MediaPlayerState *mediaPlayerState; |
59 | 59 | ||
60 | QString audioMimes ="audio/mpeg;audio/x-wav;audio/x-ogg"; | ||
61 | // no m3u's here please | ||
60 | 62 | ||
61 | PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) | 63 | PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) |
62 | : PlayListWidgetGui( parent, name, fl ) { | 64 | : PlayListWidgetGui( parent, name, fl ) { |
63 | 65 | ||
@@ -204,9 +206,9 @@ void PlayListWidget::addToSelection( const DocLnk& lnk ) { | |||
204 | if ( mediaPlayerState->playlist() ) { | 206 | if ( mediaPlayerState->playlist() ) { |
205 | if( QFileInfo( lnk.file() ).exists() || | 207 | if( QFileInfo( lnk.file() ).exists() || |
206 | lnk.file().left(4) == "http" ) | 208 | lnk.file().left(4) == "http" ) |
207 | d->selectedFiles->addToSelection( lnk ); | 209 | d->selectedFiles->addToSelection( lnk ); |
208 | writeCurrentM3u(); | 210 | // writeCurrentM3u(); |
209 | } | 211 | } |
210 | else | 212 | else |
211 | mediaPlayerState->setPlaying( TRUE ); | 213 | mediaPlayerState->setPlaying( TRUE ); |
212 | } | 214 | } |
@@ -251,9 +253,9 @@ void PlayListWidget::playlistViewPressed( int mouse, QListViewItem *, const QPoi | |||
251 | 253 | ||
252 | 254 | ||
253 | void PlayListWidget::addAllToList() { | 255 | void PlayListWidget::addAllToList() { |
254 | DocLnkSet filesAll; | 256 | DocLnkSet filesAll; |
255 | Global::findDocuments(&filesAll, "video/*;audio/*"); | 257 | Global::findDocuments(&filesAll, "video/*;"+audioMimes); |
256 | QListIterator<DocLnk> Adit( filesAll.children() ); | 258 | QListIterator<DocLnk> Adit( filesAll.children() ); |
257 | for ( ; Adit.current(); ++Adit ) { | 259 | for ( ; Adit.current(); ++Adit ) { |
258 | if( QFileInfo( Adit.current()->file() ).exists() ) { | 260 | if( QFileInfo( Adit.current()->file() ).exists() ) { |
259 | d->selectedFiles->addToSelection( **Adit ); | 261 | d->selectedFiles->addToSelection( **Adit ); |
@@ -263,8 +265,10 @@ void PlayListWidget::addAllToList() { | |||
263 | } | 265 | } |
264 | 266 | ||
265 | 267 | ||
266 | void PlayListWidget::addAllMusicToList() { | 268 | void PlayListWidget::addAllMusicToList() { |
269 | if(!audioScan) | ||
270 | scanForAudio(); | ||
267 | QListIterator<DocLnk> dit( files.children() ); | 271 | QListIterator<DocLnk> dit( files.children() ); |
268 | for ( ; dit.current(); ++dit ) { | 272 | for ( ; dit.current(); ++dit ) { |
269 | if( QFileInfo(dit.current()->file() ).exists() ) { | 273 | if( QFileInfo(dit.current()->file() ).exists() ) { |
270 | d->selectedFiles->addToSelection( **dit ); | 274 | d->selectedFiles->addToSelection( **dit ); |
@@ -274,8 +278,10 @@ void PlayListWidget::addAllMusicToList() { | |||
274 | } | 278 | } |
275 | 279 | ||
276 | 280 | ||
277 | void PlayListWidget::addAllVideoToList() { | 281 | void PlayListWidget::addAllVideoToList() { |
282 | if(!videoScan) | ||
283 | scanForVideo(); | ||
278 | QListIterator<DocLnk> dit( vFiles.children() ); | 284 | QListIterator<DocLnk> dit( vFiles.children() ); |
279 | for ( ; dit.current(); ++dit ) { | 285 | for ( ; dit.current(); ++dit ) { |
280 | if( QFileInfo( dit.current()->file() ).exists() ) { | 286 | if( QFileInfo( dit.current()->file() ).exists() ) { |
281 | d->selectedFiles->addToSelection( **dit ); | 287 | d->selectedFiles->addToSelection( **dit ); |
@@ -305,8 +311,10 @@ void PlayListWidget::setDocument( const QString& fileref ) { | |||
305 | readPls( DocLnk( fileref).file() ); | 311 | readPls( DocLnk( fileref).file() ); |
306 | } else { | 312 | } else { |
307 | clearList(); | 313 | clearList(); |
308 | addToSelection( DocLnk( fileref ) ); | 314 | addToSelection( DocLnk( fileref ) ); |
315 | writeCurrentM3u(); | ||
316 | |||
309 | d->setDocumentUsed = TRUE; | 317 | d->setDocumentUsed = TRUE; |
310 | mediaPlayerState->setPlaying( FALSE ); | 318 | mediaPlayerState->setPlaying( FALSE ); |
311 | mediaPlayerState->setPlaying( TRUE ); | 319 | mediaPlayerState->setPlaying( TRUE ); |
312 | } | 320 | } |
@@ -611,9 +619,9 @@ void PlayListWidget::scanForAudio() { | |||
611 | for ( ; sdit.current(); ++sdit ) { | 619 | for ( ; sdit.current(); ++sdit ) { |
612 | delete sdit.current(); | 620 | delete sdit.current(); |
613 | } | 621 | } |
614 | // Global::findDocuments( &files, "audio/*"); | 622 | // Global::findDocuments( &files, "audio/*"); |
615 | Global::findDocuments( &files, "audio/mpeg;audio/x-wav;audio/x-ogg"); | 623 | Global::findDocuments( &files, audioMimes); |
616 | audioScan = TRUE; | 624 | audioScan = TRUE; |
617 | } | 625 | } |
618 | 626 | ||
619 | void PlayListWidget::scanForVideo() { | 627 | void PlayListWidget::scanForVideo() { |
@@ -843,18 +851,19 @@ void PlayListWidget::writeCurrentM3u() { | |||
843 | qDebug("writing to current m3u"); | 851 | qDebug("writing to current m3u"); |
844 | Config cfg( "OpiePlayer" ); | 852 | Config cfg( "OpiePlayer" ); |
845 | cfg.setGroup("PlayList"); | 853 | cfg.setGroup("PlayList"); |
846 | QString currentPlaylist = cfg.readEntry("CurrentPlaylist",""); | 854 | QString currentPlaylist = cfg.readEntry("CurrentPlaylist",""); |
847 | // int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 ); | 855 | |
848 | Om3u *m3uList; | 856 | Om3u *m3uList; |
849 | m3uList = new Om3u( currentPlaylist, IO_ReadWrite |IO_Truncate ); | 857 | m3uList = new Om3u( currentPlaylist, IO_ReadWrite | IO_Truncate ); |
850 | d->selectedFiles->first(); | 858 | d->selectedFiles->first(); |
851 | 859 | qDebug( d->selectedFiles->current()->file()); | |
852 | do { | 860 | do { |
853 | m3uList->add( d->selectedFiles->current()->file()); | 861 | qDebug( d->selectedFiles->current()->file()); |
862 | m3uList->add( d->selectedFiles->current()->file() ); | ||
854 | } | 863 | } |
855 | while ( d->selectedFiles->next() ); | 864 | while ( d->selectedFiles->next() ); |
856 | // qDebug( list ); | 865 | qDebug( "<<<<<<<<<<<<>>>>>>>>>>>>>>>>>" ); |
857 | m3uList->write(); | 866 | m3uList->write(); |
858 | m3uList->close(); | 867 | m3uList->close(); |
859 | 868 | ||
860 | if(m3uList) delete m3uList; | 869 | if(m3uList) delete m3uList; |