summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/mediaplayerstate.h1
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidget.cpp14
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidget.h1
3 files changed, 1 insertions, 15 deletions
diff --git a/noncore/multimedia/opieplayer2/mediaplayerstate.h b/noncore/multimedia/opieplayer2/mediaplayerstate.h
index d15894f..7a80ad8 100644
--- a/noncore/multimedia/opieplayer2/mediaplayerstate.h
+++ b/noncore/multimedia/opieplayer2/mediaplayerstate.h
@@ -102,7 +102,6 @@ signals:
102 void scaledToggled( bool ); 102 void scaledToggled( bool );
103 void loopingToggled( bool ); 103 void loopingToggled( bool );
104 void shuffledToggled( bool ); 104 void shuffledToggled( bool );
105 void playlistToggled( bool );
106 void pausedToggled( bool ); 105 void pausedToggled( bool );
107 void playingToggled( bool ); 106 void playingToggled( bool );
108 void stopToggled( bool ); 107 void stopToggled( bool );
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index 6355bec..5b277cc 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -147,8 +147,6 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
147 d->tbLoop, SLOT( setOn( bool ) ) ); 147 d->tbLoop, SLOT( setOn( bool ) ) );
148 connect( mediaPlayerState, SIGNAL( shuffledToggled( bool ) ), 148 connect( mediaPlayerState, SIGNAL( shuffledToggled( bool ) ),
149 d->tbShuffle, SLOT( setOn( bool ) ) ); 149 d->tbShuffle, SLOT( setOn( bool ) ) );
150 connect( mediaPlayerState, SIGNAL( playlistToggled( bool ) ),
151 this, SLOT( setPlaylist( bool ) ) );
152 connect( d->selectedFiles, SIGNAL( doubleClicked( QListViewItem *) ), 150 connect( d->selectedFiles, SIGNAL( doubleClicked( QListViewItem *) ),
153 this, SLOT( playIt( QListViewItem *) ) ); 151 this, SLOT( playIt( QListViewItem *) ) );
154 connect ( gammaSlider, SIGNAL( valueChanged( int ) ), 152 connect ( gammaSlider, SIGNAL( valueChanged( int ) ),
@@ -177,7 +175,7 @@ void PlayListWidget::initializeStates() {
177 d->tbPlay->setOn( mediaPlayerState->isPlaying() ); 175 d->tbPlay->setOn( mediaPlayerState->isPlaying() );
178 d->tbLoop->setOn( mediaPlayerState->isLooping() ); 176 d->tbLoop->setOn( mediaPlayerState->isLooping() );
179 d->tbShuffle->setOn( mediaPlayerState->isShuffled() ); 177 d->tbShuffle->setOn( mediaPlayerState->isShuffled() );
180 setPlaylist( true ); 178 d->playListFrame->show();
181} 179}
182 180
183void PlayListWidget::writeDefaultPlaylist() { 181void PlayListWidget::writeDefaultPlaylist() {
@@ -517,16 +515,6 @@ void PlayListWidget::loadList( const DocLnk & lnk) {
517 } 515 }
518} 516}
519 517
520
521void PlayListWidget::setPlaylist( bool shown ) {
522 if ( shown ) {
523 d->playListFrame->show();
524 } else {
525 d->playListFrame->hide();
526 }
527}
528
529
530void PlayListWidget::addSelected() { 518void PlayListWidget::addSelected() {
531 assert( inFileListMode() ); 519 assert( inFileListMode() );
532 520
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.h b/noncore/multimedia/opieplayer2/playlistwidget.h
index 511a192..fa2837a 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.h
+++ b/noncore/multimedia/opieplayer2/playlistwidget.h
@@ -119,7 +119,6 @@ private slots:
119 void setDocument( const QString& fileref ); 119 void setDocument( const QString& fileref );
120 void addToSelection( const DocLnk& ); // Add a media file to the playlist 120 void addToSelection( const DocLnk& ); // Add a media file to the playlist
121 void addToSelection( QListViewItem* ); // Add a media file to the playlist 121 void addToSelection( QListViewItem* ); // Add a media file to the playlist
122 void setPlaylist( bool ); // Show/Hide the playlist
123 void clearList(); 122 void clearList();
124 void addAllToList(); 123 void addAllToList();
125 void addAllMusicToList(); 124 void addAllMusicToList();