summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidget.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index 6a15134..36f77be 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -298,67 +298,73 @@ void PlayListWidget::addAllMusicToList() {
298 for ( ; audioIt.current(); ++audioIt ) { 298 for ( ; audioIt.current(); ++audioIt ) {
299 filename = audioIt.current()->text(3); 299 filename = audioIt.current()->text(3);
300 lnk.setName( QFileInfo(filename).baseName() ); //sets name 300 lnk.setName( QFileInfo(filename).baseName() ); //sets name
301 lnk.setFile( filename ); //sets file name 301 lnk.setFile( filename ); //sets file name
302 d->selectedFiles->addToSelection( lnk); 302 d->selectedFiles->addToSelection( lnk);
303 } 303 }
304 304
305 tabWidget->setCurrentPage(0); 305 tabWidget->setCurrentPage(0);
306 writeCurrentM3u(); 306 writeCurrentM3u();
307 d->selectedFiles->first(); 307 d->selectedFiles->first();
308} 308}
309 309
310 310
311void PlayListWidget::addAllVideoToList() { 311void PlayListWidget::addAllVideoToList() {
312 312
313 videoView->populateView(); 313 videoView->populateView();
314 314
315 QListViewItemIterator videoIt( videoView ); 315 QListViewItemIterator videoIt( videoView );
316 DocLnk lnk; 316 DocLnk lnk;
317 QString filename; 317 QString filename;
318 for ( ; videoIt.current(); ++videoIt ) { 318 for ( ; videoIt.current(); ++videoIt ) {
319 filename = videoIt.current()->text(3); 319 filename = videoIt.current()->text(3);
320 lnk.setName( QFileInfo(filename).baseName() ); //sets name 320 lnk.setName( QFileInfo(filename).baseName() ); //sets name
321 lnk.setFile( filename ); //sets file name 321 lnk.setFile( filename ); //sets file name
322 d->selectedFiles->addToSelection( lnk); 322 d->selectedFiles->addToSelection( lnk);
323 } 323 }
324 tabWidget->setCurrentPage(0); 324 tabWidget->setCurrentPage(0);
325 writeCurrentM3u(); 325 writeCurrentM3u();
326 d->selectedFiles->first(); 326 d->selectedFiles->first();
327} 327}
328 328
329 329
330void PlayListWidget::setDocument( const QString& fileref ) { 330void PlayListWidget::setDocument( const QString& _fileref ) {
331 // odebug << "<<<<<<<<set document>>>>>>>>>> "+fileref << oendl; 331 // odebug << "<<<<<<<<set document>>>>>>>>>> "+fileref << oendl;
332 QString fileref = _fileref;
332 fromSetDocument = TRUE; 333 fromSetDocument = TRUE;
334
335 DocLnk lnk(_fileref);
336 if(lnk.isValid())
337 fileref = lnk.file();
338
333 QFileInfo fileInfo(fileref); 339 QFileInfo fileInfo(fileref);
334 340
335 if ( !fileInfo.exists() ) { 341 if ( !fileInfo.exists() ) {
336 QMessageBox::warning( this, tr( "Invalid File" ), 342 QMessageBox::warning( this, tr( "Invalid File" ),
337 tr( "There was a problem in getting the file." ) ); 343 tr( "There was a problem in getting the file." ) );
338 return; 344 return;
339 } 345 }
340 346
341 clearList(); 347 clearList();
342 QString extension = fileInfo.extension(false); 348 QString extension = fileInfo.extension(false);
343 349
344 if( extension.find( "m3u", 0, false) != -1 350 if( extension.find( "m3u", 0, false) != -1
345 || extension.find( "pls", 0, false) != -1 ) { 351 || extension.find( "pls", 0, false) != -1 ) {
346 readListFromFile( fileref ); 352 readListFromFile( fileref );
347 } else { 353 } else {
348 clearList(); 354 clearList();
349 DocLnk lnk; 355 DocLnk lnk;
350 lnk.setName( fileInfo.baseName() ); //sets name 356 lnk.setName( fileInfo.baseName() ); //sets name
351 lnk.setFile( fileref ); //sets file name 357 lnk.setFile( fileref ); //sets file name
352 addToSelection( lnk ); 358 addToSelection( lnk );
353 writeCurrentM3u(); 359 writeCurrentM3u();
354 360
355 d->setDocumentUsed = TRUE; 361 d->setDocumentUsed = TRUE;
356 mediaPlayerState->setPlaying( FALSE ); 362 mediaPlayerState->setPlaying( FALSE );
357 mediaPlayerState->setPlaying( TRUE ); 363 mediaPlayerState->setPlaying( TRUE );
358 } 364 }
359} 365}
360 366
361 367
362void PlayListWidget::useSelectedDocument() { 368void PlayListWidget::useSelectedDocument() {
363 d->setDocumentUsed = FALSE; 369 d->setDocumentUsed = FALSE;
364} 370}