summaryrefslogtreecommitdiff
path: root/noncore/multimedia/opieplayer2/mediaplayerstate.cpp
Unidiff
Diffstat (limited to 'noncore/multimedia/opieplayer2/mediaplayerstate.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/mediaplayerstate.cpp27
1 files changed, 3 insertions, 24 deletions
diff --git a/noncore/multimedia/opieplayer2/mediaplayerstate.cpp b/noncore/multimedia/opieplayer2/mediaplayerstate.cpp
index 901b43f..40fa1a4 100644
--- a/noncore/multimedia/opieplayer2/mediaplayerstate.cpp
+++ b/noncore/multimedia/opieplayer2/mediaplayerstate.cpp
@@ -82,24 +82,12 @@ void MediaPlayerState::writeConfig( Config& cfg ) const {
82 cfg.writeEntry( "Scaling", scaled ); 82 cfg.writeEntry( "Scaling", scaled );
83 cfg.writeEntry( "Looping", looping ); 83 cfg.writeEntry( "Looping", looping );
84 cfg.writeEntry( "Shuffle", shuffled ); 84 cfg.writeEntry( "Shuffle", shuffled );
85 cfg.writeEntry( "VideoGamma", videoGamma ); 85 cfg.writeEntry( "VideoGamma", videoGamma );
86} 86}
87 87
88char MediaPlayerState::view() const
89{
90 switch ( m_displayType ) {
91 case Audio: return 'a';
92 case Video: return 'v';
93 case MediaSelection: return 'l';
94 default: assert( false );
95 }
96 // never reached
97 return 42;
98}
99
100MediaPlayerState::DisplayType MediaPlayerState::displayType() const 88MediaPlayerState::DisplayType MediaPlayerState::displayType() const
101{ 89{
102 return m_displayType; 90 return m_displayType;
103} 91}
104 92
105// slots 93// slots
@@ -211,21 +199,12 @@ void MediaPlayerState::setLength( long l ) {
211 return; 199 return;
212 } 200 }
213 curLength = l; 201 curLength = l;
214 emit lengthChanged(l); 202 emit lengthChanged(l);
215} 203}
216 204
217void MediaPlayerState::setView( char v ) {
218 switch ( v ) {
219 case 'a': setDisplayType( Audio ); return;
220 case 'v': setDisplayType( Video ); return;
221 case 'l': setDisplayType( MediaSelection ); return;
222 default: assert( false );
223 }
224}
225
226void MediaPlayerState::setDisplayType( DisplayType displayType ) 205void MediaPlayerState::setDisplayType( DisplayType displayType )
227{ 206{
228 if ( m_displayType == displayType ) 207 if ( m_displayType == displayType )
229 return; 208 return;
230 209
231 m_displayType = displayType; 210 m_displayType = displayType;
@@ -239,21 +218,21 @@ void MediaPlayerState::setPrev(){
239void MediaPlayerState::setNext() { 218void MediaPlayerState::setNext() {
240 emit next(); 219 emit next();
241} 220}
242 221
243void MediaPlayerState::setList() { 222void MediaPlayerState::setList() {
244 setPlaying( FALSE ); 223 setPlaying( FALSE );
245 setView('l'); 224 setDisplayType( MediaSelection );
246} 225}
247 226
248void MediaPlayerState::setVideo() { 227void MediaPlayerState::setVideo() {
249 setView('v'); 228 setDisplayType( Video );
250} 229}
251 230
252void MediaPlayerState::setAudio() { 231void MediaPlayerState::setAudio() {
253 setView('a'); 232 setDisplayType( Audio );
254} 233}
255 234
256void MediaPlayerState::toggleFullscreen() { 235void MediaPlayerState::toggleFullscreen() {
257 setFullscreen( !fullscreen ); 236 setFullscreen( !fullscreen );
258} 237}
259 238