summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/mediaplayerstate.cpp12
-rw-r--r--noncore/multimedia/opieplayer2/mediaplayerstate.h2
2 files changed, 0 insertions, 14 deletions
diff --git a/noncore/multimedia/opieplayer2/mediaplayerstate.cpp b/noncore/multimedia/opieplayer2/mediaplayerstate.cpp
index aa85176..43040c2 100644
--- a/noncore/multimedia/opieplayer2/mediaplayerstate.cpp
+++ b/noncore/multimedia/opieplayer2/mediaplayerstate.cpp
@@ -132,32 +132,24 @@ void MediaPlayerState::setLooping( bool b ) {
132 looping = b; 132 looping = b;
133 emit loopingToggled(b); 133 emit loopingToggled(b);
134} 134}
135 135
136void MediaPlayerState::setShuffled( bool b ) { 136void MediaPlayerState::setShuffled( bool b ) {
137 if ( shuffled == b ) { 137 if ( shuffled == b ) {
138 return; 138 return;
139 } 139 }
140 shuffled = b; 140 shuffled = b;
141 emit shuffledToggled(b); 141 emit shuffledToggled(b);
142} 142}
143 143
144void MediaPlayerState::setUsingPlaylist( bool b ) {
145 if ( usePlaylist == b ) {
146 return;
147 }
148 usePlaylist = b;
149 emit playlistToggled(b);
150}
151
152void MediaPlayerState::setPaused( bool b ) { 144void MediaPlayerState::setPaused( bool b ) {
153 if ( paused == b ) { 145 if ( paused == b ) {
154 paused = FALSE; 146 paused = FALSE;
155 emit pausedToggled(FALSE); 147 emit pausedToggled(FALSE);
156 return; 148 return;
157 } 149 }
158 paused = b; 150 paused = b;
159 emit pausedToggled(b); 151 emit pausedToggled(b);
160} 152}
161 153
162void MediaPlayerState::setPlaying( bool b ) { 154void MediaPlayerState::setPlaying( bool b ) {
163 if ( playing == b ) { 155 if ( playing == b ) {
@@ -244,28 +236,24 @@ void MediaPlayerState::toggleFullscreen() {
244void MediaPlayerState::toggleScaled() { 236void MediaPlayerState::toggleScaled() {
245 setScaled( !scaled); 237 setScaled( !scaled);
246} 238}
247 239
248void MediaPlayerState::toggleLooping() { 240void MediaPlayerState::toggleLooping() {
249 setLooping( !looping); 241 setLooping( !looping);
250} 242}
251 243
252void MediaPlayerState::toggleShuffled() { 244void MediaPlayerState::toggleShuffled() {
253 setShuffled( !shuffled); 245 setShuffled( !shuffled);
254} 246}
255 247
256void MediaPlayerState::togglePlaylist() {
257 setUsingPlaylist( !usePlaylist);
258}
259
260void MediaPlayerState::togglePaused() { 248void MediaPlayerState::togglePaused() {
261 setPaused( !paused); 249 setPaused( !paused);
262} 250}
263 251
264void MediaPlayerState::togglePlaying() { 252void MediaPlayerState::togglePlaying() {
265 setPlaying( !playing); 253 setPlaying( !playing);
266} 254}
267 255
268void MediaPlayerState::toggleBlank() { 256void MediaPlayerState::toggleBlank() {
269 setBlanked( !blanked); 257 setBlanked( !blanked);
270} 258}
271 259
diff --git a/noncore/multimedia/opieplayer2/mediaplayerstate.h b/noncore/multimedia/opieplayer2/mediaplayerstate.h
index 163586b..d15894f 100644
--- a/noncore/multimedia/opieplayer2/mediaplayerstate.h
+++ b/noncore/multimedia/opieplayer2/mediaplayerstate.h
@@ -62,46 +62,44 @@ public:
62 bool isStopped() const { return stopped; } 62 bool isStopped() const { return stopped; }
63 long position() const { return curPosition; } 63 long position() const { return curPosition; }
64 long length() const { return curLength; } 64 long length() const { return curLength; }
65 char view() const { return curView; } 65 char view() const { return curView; }
66 66
67public slots: 67public slots:
68 void setIsStreaming( bool b ); 68 void setIsStreaming( bool b );
69 void setIsSeekable( bool b ); 69 void setIsSeekable( bool b );
70 void setFullscreen( bool b ); 70 void setFullscreen( bool b );
71 void setScaled( bool b ); 71 void setScaled( bool b );
72 void setLooping( bool b ); 72 void setLooping( bool b );
73 void setShuffled( bool b ); 73 void setShuffled( bool b );
74 void setUsingPlaylist( bool b );
75 void setPaused( bool b ); 74 void setPaused( bool b );
76 void setPlaying( bool b ); 75 void setPlaying( bool b );
77 void setStopped( bool b ); 76 void setStopped( bool b );
78 void setPosition( long p ); 77 void setPosition( long p );
79 void updatePosition( long p ); 78 void updatePosition( long p );
80 void setLength( long l ); 79 void setLength( long l );
81 void setView( char v ); 80 void setView( char v );
82 void setBlanked( bool b ); 81 void setBlanked( bool b );
83 void setVideoGamma( int v ); 82 void setVideoGamma( int v );
84 83
85 void setPrev(); 84 void setPrev();
86 void setNext(); 85 void setNext();
87 void setList(); 86 void setList();
88 void setVideo(); 87 void setVideo();
89 void setAudio(); 88 void setAudio();
90 89
91 void toggleFullscreen(); 90 void toggleFullscreen();
92 void toggleScaled(); 91 void toggleScaled();
93 void toggleLooping(); 92 void toggleLooping();
94 void toggleShuffled(); 93 void toggleShuffled();
95 void togglePlaylist();
96 void togglePaused(); 94 void togglePaused();
97 void togglePlaying(); 95 void togglePlaying();
98 void toggleBlank(); 96 void toggleBlank();
99 void writeConfig( Config& cfg ) const; 97 void writeConfig( Config& cfg ) const;
100 98
101 99
102signals: 100signals:
103 void fullscreenToggled( bool ); 101 void fullscreenToggled( bool );
104 void scaledToggled( bool ); 102 void scaledToggled( bool );
105 void loopingToggled( bool ); 103 void loopingToggled( bool );
106 void shuffledToggled( bool ); 104 void shuffledToggled( bool );
107 void playlistToggled( bool ); 105 void playlistToggled( bool );