Diffstat (limited to 'noncore/multimedia/opieplayer2/playlistwidget.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidget.cpp | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp index b78ce24..889667c 100644 --- a/noncore/multimedia/opieplayer2/playlistwidget.cpp +++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp @@ -57,5 +57,6 @@ PlayListWidget::PlayListWidget( MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name ) - : PlayListWidgetGui( mediaPlayerState, parent, name ) { + : PlayListWidgetGui( mediaPlayerState, parent, name ) , currentFileListView( 0 ) +{ d->tbAddToList = new ToolButton( bar, tr( "Add to Playlist" ), @@ -478,6 +479,5 @@ void PlayListWidget::addSelected() { assert( inFileListMode() ); - QListView *fileListView = currentFileListView(); - QListViewItemIterator it( fileListView ); + QListViewItemIterator it( currentFileListView ); for ( ; it.current(); ++it ) if ( it.current()->isSelected() ) { @@ -491,5 +491,5 @@ void PlayListWidget::addSelected() { } - fileListView->clearSelection(); + currentFileListView->clearSelection(); tabWidget->setCurrentPage( 0 ); @@ -543,4 +543,6 @@ void PlayListWidget::tabChanged(QWidget *) { d->tbPlay, SLOT( setEnabled( bool ) ) ); + currentFileListView = 0; + switch ( currentTab() ) { case CurrentPlayList: @@ -569,4 +571,6 @@ void PlayListWidget::tabChanged(QWidget *) { d->tbPlay->setEnabled( audioView->hasSelection() ); + + currentFileListView = audioView; } break; @@ -584,4 +588,6 @@ void PlayListWidget::tabChanged(QWidget *) { d->tbPlay->setEnabled( videoView->hasSelection() ); + + currentFileListView = videoView; } break; @@ -626,14 +632,4 @@ void PlayListWidget::playSelected() { } -QListView *PlayListWidget::currentFileListView() const -{ - switch ( currentTab() ) { - case AudioFiles: return audioView; - case VideoFiles: return videoView; - default: assert( false ); - } - return 0; -} - bool PlayListWidget::inFileListMode() const { @@ -1010,4 +1006,4 @@ PlayListWidget::Entry PlayListWidget::currentEntry() const QString PlayListWidget::currentFileListPathName() const { - return currentFileListView()->currentItem()->text( 3 ); + return currentFileListView->currentItem()->text( 3 ); } |