summaryrefslogtreecommitdiff
authorsimon <simon>2002-12-02 17:22:29 (UTC)
committer simon <simon>2002-12-02 17:22:29 (UTC)
commit28f9d0587b2ee6a6a9467f658567a45ab7e95b94 (patch) (unidiff)
tree509fcf475ca55dde3d64f6719a2a751c8c4a88dc
parenta79674bdbba0093f4bba78f47905b67fd2f32a8f (diff)
downloadopie-28f9d0587b2ee6a6a9467f658567a45ab7e95b94.zip
opie-28f9d0587b2ee6a6a9467f658567a45ab7e95b94.tar.gz
opie-28f9d0587b2ee6a6a9467f658567a45ab7e95b94.tar.bz2
- removed the playlistToggled signal, as it is never emitted
- resulted in some simplification in playlistwidget
Diffstat (more/less context) (show 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
@@ -99,13 +99,12 @@ public slots:
99 99
100signals: 100signals:
101 void fullscreenToggled( bool ); 101 void fullscreenToggled( bool );
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 );
109 void positionChanged( long ); // When the slider is moved 108 void positionChanged( long ); // When the slider is moved
110 void positionUpdated( long ); // When the media file progresses 109 void positionUpdated( long ); // When the media file progresses
111 void lengthChanged( long ); 110 void lengthChanged( long );
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
@@ -144,14 +144,12 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
144 connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), 144 connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ),
145 d->tbPlay, SLOT( setOn( bool ) ) ); 145 d->tbPlay, SLOT( setOn( bool ) ) );
146 connect( mediaPlayerState, SIGNAL( loopingToggled( bool ) ), 146 connect( mediaPlayerState, SIGNAL( loopingToggled( bool ) ),
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 ) ),
155 mediaPlayerState, SLOT( setVideoGamma( int ) ) ); 153 mediaPlayerState, SLOT( setVideoGamma( int ) ) );
156 154
157 // see which skins are installed 155 // see which skins are installed
@@ -174,13 +172,13 @@ PlayListWidget::~PlayListWidget() {
174 172
175 173
176void PlayListWidget::initializeStates() { 174void 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() {
184 182
185 Config config( "OpiePlayer" ); 183 Config config( "OpiePlayer" );
186 config.setGroup( "PlayList" ); 184 config.setGroup( "PlayList" );
@@ -514,22 +512,12 @@ void PlayListWidget::loadList( const DocLnk & lnk) {
514 clearList(); 512 clearList();
515 readm3u(lnk.file()); 513 readm3u(lnk.file());
516 tabWidget->setCurrentPage(0); 514 tabWidget->setCurrentPage(0);
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
533 QListView *fileListView = currentFileListView(); 521 QListView *fileListView = currentFileListView();
534 QListViewItemIterator it( fileListView ); 522 QListViewItemIterator it( fileListView );
535 for ( ; it.current(); ++it ) 523 for ( ; it.current(); ++it )
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
@@ -116,13 +116,12 @@ private slots:
116 void scanForAudio(); 116 void scanForAudio();
117 void scanForVideo(); 117 void scanForVideo();
118 void openFile(); 118 void openFile();
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();
126 void addAllVideoToList(); 125 void addAllVideoToList();
127 void saveList(); // Save the playlist 126 void saveList(); // Save the playlist
128 void loadList( const DocLnk &); // Load a playlist 127 void loadList( const DocLnk &); // Load a playlist