summaryrefslogtreecommitdiff
path: root/noncore/multimedia/opieplayer2/mediaplayer.cpp
Unidiff
Diffstat (limited to 'noncore/multimedia/opieplayer2/mediaplayer.cpp') (more/less context) (show whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/mediaplayer.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp
index 1f19b30..8136ff1 100644
--- a/noncore/multimedia/opieplayer2/mediaplayer.cpp
+++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp
@@ -74,7 +74,7 @@ MediaPlayer::~MediaPlayer() {
74} 74}
75 75
76void MediaPlayer::pauseCheck( bool b ) { 76void MediaPlayer::pauseCheck( bool b ) {
77 if ( b && !mediaPlayerState->playing() ) { 77 if ( b && !mediaPlayerState->isPlaying() ) {
78 mediaPlayerState->setPaused( FALSE ); 78 mediaPlayerState->setPaused( FALSE );
79 } 79 }
80} 80}
@@ -89,7 +89,7 @@ void MediaPlayer::setPlaying( bool play ) {
89 return; 89 return;
90 } 90 }
91 91
92 if ( mediaPlayerState->paused() ) { 92 if ( mediaPlayerState->isPaused() ) {
93 mediaPlayerState->setPaused( FALSE ); 93 mediaPlayerState->setPaused( FALSE );
94 return; 94 return;
95 } 95 }
@@ -111,11 +111,11 @@ void MediaPlayer::setPlaying( bool play ) {
111 // random and looping settings enabled causes problems here, 111 // random and looping settings enabled causes problems here,
112 // since there is no selected file in the playlist, but a selected file in the file list, 112 // since there is no selected file in the playlist, but a selected file in the file list,
113 // so we remember and shutoff 113 // so we remember and shutoff
114 l = mediaPlayerState->looping(); 114 l = mediaPlayerState->isLooping();
115 if(l) { 115 if(l) {
116 mediaPlayerState->setLooping( false ); 116 mediaPlayerState->setLooping( false );
117 } 117 }
118 r = mediaPlayerState->shuffled(); 118 r = mediaPlayerState->isShuffled();
119 mediaPlayerState->setShuffled( false ); 119 mediaPlayerState->setShuffled( false );
120 120
121 fileName = playList->currentFileListPathName(); 121 fileName = playList->currentFileListPathName();
@@ -150,7 +150,7 @@ void MediaPlayer::prev() {
150 if( playList->whichList() == 0 ) { //if using the playlist 150 if( playList->whichList() == 0 ) { //if using the playlist
151 if ( playList->prev() ) { 151 if ( playList->prev() ) {
152 play(); 152 play();
153 } else if ( mediaPlayerState->looping() ) { 153 } else if ( mediaPlayerState->isLooping() ) {
154 if ( playList->last() ) { 154 if ( playList->last() ) {
155 play(); 155 play();
156 } 156 }
@@ -166,7 +166,7 @@ void MediaPlayer::next() {
166 if(playList->whichList() == 0) { //if using the playlist 166 if(playList->whichList() == 0) { //if using the playlist
167 if ( playList->next() ) { 167 if ( playList->next() ) {
168 play(); 168 play();
169 } else if ( mediaPlayerState->looping() ) { 169 } else if ( mediaPlayerState->isLooping() ) {
170 if ( playList->first() ) { 170 if ( playList->first() ) {
171 play(); 171 play();
172 } 172 }