summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/multimedia/opieplayer/playlistwidget.cpp39
1 files changed, 5 insertions, 34 deletions
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp
index 8d66407..5be0d6d 100644
--- a/core/multimedia/opieplayer/playlistwidget.cpp
+++ b/core/multimedia/opieplayer/playlistwidget.cpp
@@ -271,5 +271,3 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
271 tabWidget->insertTab( vTab,tr("Video")); 271 tabWidget->insertTab( vTab,tr("Video"));
272// populateVideoView();
273 272
274//playlists list
275 QWidget *LTab; 273 QWidget *LTab;
@@ -280,14 +278,2 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
280 278
281// connect( playLists, SIGNAL( newSelected( const DocLnk &) ), this, SLOT( newFile( const DocLnk & ) ) );
282
283// add the library area
284
285// connect( audioView, SIGNAL( rightButtonClicked( QListViewItem *, const QPoint &, int)),
286// this, SLOT( fauxPlay( QListViewItem *) ) );
287// connect( videoView, SIGNAL( rightButtonClicked( QListViewItem *, const QPoint &, int)),
288// this, SLOT( fauxPlay( QListViewItem *)) );
289
290// connect( audioView, SIGNAL( clicked( QListViewItem *) ), this, SLOT( fauxPlay( QListViewItem *) ) );
291// connect( videoView, SIGNAL( clicked( QListViewItem *) ), this, SLOT( fauxPlay( QListViewItem *) ) );
292
293 connect(tbDeletePlaylist,(SIGNAL(released())),SLOT( deletePlaylist())); 279 connect(tbDeletePlaylist,(SIGNAL(released())),SLOT( deletePlaylist()));
@@ -322,3 +308,2 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
322 connect( d->selectedFiles, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( playIt( QListViewItem *) ) ); 308 connect( d->selectedFiles, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( playIt( QListViewItem *) ) );
323// connect( d->selectedFiles, SIGNAL( fileSelected( const DocLnk & ) ), this, SLOT( addToSelection( const DocLnk & ) ) );
324 309
@@ -329,3 +314,2 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
329 QString currentPlaylist = cfg.readEntry("CurrentPlaylist",""); 314 QString currentPlaylist = cfg.readEntry("CurrentPlaylist","");
330// qDebug("currentList is "+currentPlaylist);
331 loadList(DocLnk( currentPlaylist)); 315 loadList(DocLnk( currentPlaylist));
@@ -353,9 +337,3 @@ void PlayListWidget::initializeStates() {
353 d->tbShuffle->setOn( mediaPlayerState->shuffled() ); 337 d->tbShuffle->setOn( mediaPlayerState->shuffled() );
354// d->tbFull->setOn( mediaPlayerState->fullscreen() );
355// d->tbScale->setOn( mediaPlayerState->scaled() );
356// d->tbScale->setEnabled( mediaPlayerState->fullscreen() );
357// setPlaylist( mediaPlayerState->playlist() );
358 setPlaylist( true); 338 setPlaylist( true);
359// d->selectedFiles->first();
360
361} 339}
@@ -377,3 +355,2 @@ void PlayListWidget::readConfig( Config& cfg ) {
377 d->selectedFiles->setSelectedItem( currentString); 355 d->selectedFiles->setSelectedItem( currentString);
378// d->selectedFiles->setSelectedItem( (const QString &)currentString);
379} 356}
@@ -418,8 +395,2 @@ void PlayListWidget::writeConfig( Config& cfg ) const {
418void PlayListWidget::addToSelection( const DocLnk& lnk ) { 395void PlayListWidget::addToSelection( const DocLnk& lnk ) {
419// qDebug("add");
420// if( lnk.file().find(" ",0,TRUE) != -1 || lnk.file().find("%20",0,TRUE) != -1) {
421// QMessageBox::message("Note","You are trying to play\na malformed url.");
422
423// } else {
424
425 d->setDocumentUsed = FALSE; 396 d->setDocumentUsed = FALSE;
@@ -431,3 +402,2 @@ void PlayListWidget::addToSelection( const DocLnk& lnk ) {
431 mediaPlayerState->setPlaying( TRUE ); 402 mediaPlayerState->setPlaying( TRUE );
432// }
433} 403}
@@ -539,3 +509,3 @@ const DocLnk *PlayListWidget::current() { // this is fugly
539 } else { 509 } else {
540 return d->files->selected(); 510 return &(d->files->selectedDocument());
541 } 511 }
@@ -895,5 +865,5 @@ void PlayListWidget::deletePlaylist() {
895 case 0: // Yes clicked, 865 case 0: // Yes clicked,
896 QFile().remove(playLists->selected()->file()); 866// QFile().remove(playLists->selected()->file());
897 QFile().remove(playLists->selected()->linkFile()); 867// QFile().remove(playLists->selected()->linkFile());
898 playLists->reread(); 868// playLists->reread();
899 break; 869 break;
@@ -1038,2 +1008,3 @@ void PlayListWidget::populateAudioView() {
1038 size = QFile( dit.current()->file() ).size(); 1008 size = QFile( dit.current()->file() ).size();
1009 qDebug(dit.current()->name());
1039 newItem= /*(void)*/ new QListViewItem( audioView, dit.current()->name(), 1010 newItem= /*(void)*/ new QListViewItem( audioView, dit.current()->name(),