author | simon <simon> | 2002-12-02 14:34:45 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-02 14:34:45 (UTC) |
commit | 77d55b631fa3cf26bfdf809c17ee3252d3c80ac0 (patch) (unidiff) | |
tree | c57ab11232df562532ab4672db7309fef8c917d9 | |
parent | 11d12e26459315713b46dbe00a52eef0ce9e4d77 (diff) | |
download | opie-77d55b631fa3cf26bfdf809c17ee3252d3c80ac0.zip opie-77d55b631fa3cf26bfdf809c17ee3252d3c80ac0.tar.gz opie-77d55b631fa3cf26bfdf809c17ee3252d3c80ac0.tar.bz2 |
- whichList is deprecated
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp index 8136ff1..6a38adc 100644 --- a/noncore/multimedia/opieplayer2/mediaplayer.cpp +++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp | |||
@@ -90,17 +90,17 @@ void MediaPlayer::setPlaying( bool play ) { | |||
90 | } | 90 | } |
91 | 91 | ||
92 | if ( mediaPlayerState->isPaused() ) { | 92 | if ( mediaPlayerState->isPaused() ) { |
93 | mediaPlayerState->setPaused( FALSE ); | 93 | mediaPlayerState->setPaused( FALSE ); |
94 | return; | 94 | return; |
95 | } | 95 | } |
96 | 96 | ||
97 | QString tickerText, time, fileName; | 97 | QString tickerText, time, fileName; |
98 | if( playList->whichList() == 0 ) { //check for filelist | 98 | if( playList->currentTab() == PlayListWidget::CurrentPlayList ) { //check for filelist |
99 | const DocLnk *playListCurrent = playList->current(); | 99 | const DocLnk *playListCurrent = playList->current(); |
100 | if ( playListCurrent != NULL ) { | 100 | if ( playListCurrent != NULL ) { |
101 | currentFile = playListCurrent; | 101 | currentFile = playListCurrent; |
102 | } | 102 | } |
103 | xineControl->play( currentFile->file() ); | 103 | xineControl->play( currentFile->file() ); |
104 | fileName = currentFile->name(); | 104 | fileName = currentFile->name(); |
105 | long seconds = mediaPlayerState->length();// | 105 | long seconds = mediaPlayerState->length();// |
106 | time.sprintf("%li:%02i", seconds/60, (int)seconds%60 ); | 106 | time.sprintf("%li:%02i", seconds/60, (int)seconds%60 ); |
@@ -142,33 +142,33 @@ void MediaPlayer::setPlaying( bool play ) { | |||
142 | tickerText = xineControl->getMetaInfo() + " Length: " + time + " "; | 142 | tickerText = xineControl->getMetaInfo() + " Length: " + time + " "; |
143 | } | 143 | } |
144 | } | 144 | } |
145 | audioUI->setTickerText( tickerText ); | 145 | audioUI->setTickerText( tickerText ); |
146 | } | 146 | } |
147 | 147 | ||
148 | 148 | ||
149 | void MediaPlayer::prev() { | 149 | void MediaPlayer::prev() { |
150 | if( playList->whichList() == 0 ) { //if using the playlist | 150 | if( playList->currentTab() == PlayListWidget::CurrentPlayList ) { //if using the playlist |
151 | if ( playList->prev() ) { | 151 | if ( playList->prev() ) { |
152 | play(); | 152 | play(); |
153 | } else if ( mediaPlayerState->isLooping() ) { | 153 | } else if ( mediaPlayerState->isLooping() ) { |
154 | if ( playList->last() ) { | 154 | if ( playList->last() ) { |
155 | play(); | 155 | play(); |
156 | } | 156 | } |
157 | } else { | 157 | } else { |
158 | mediaPlayerState->setList(); | 158 | mediaPlayerState->setList(); |
159 | } | 159 | } |
160 | } | 160 | } |
161 | } | 161 | } |
162 | 162 | ||
163 | 163 | ||
164 | void MediaPlayer::next() { | 164 | void MediaPlayer::next() { |
165 | 165 | ||
166 | if(playList->whichList() == 0) { //if using the playlist | 166 | if(playList->currentTab() == PlayListWidget::CurrentPlayList) { //if using the playlist |
167 | if ( playList->next() ) { | 167 | if ( playList->next() ) { |
168 | play(); | 168 | play(); |
169 | } else if ( mediaPlayerState->isLooping() ) { | 169 | } else if ( mediaPlayerState->isLooping() ) { |
170 | if ( playList->first() ) { | 170 | if ( playList->first() ) { |
171 | play(); | 171 | play(); |
172 | } | 172 | } |
173 | } else { | 173 | } else { |
174 | mediaPlayerState->setList(); | 174 | mediaPlayerState->setList(); |