Diffstat (limited to 'noncore/multimedia/opieplayer2/mediaplayerstate.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayerstate.cpp | 27 |
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 | |||
@@ -85,18 +85,6 @@ void MediaPlayerState::writeConfig( Config& cfg ) const { | |||
85 | cfg.writeEntry( "VideoGamma", videoGamma ); | 85 | cfg.writeEntry( "VideoGamma", videoGamma ); |
86 | } | 86 | } |
87 | 87 | ||
88 | char 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 | |||
100 | MediaPlayerState::DisplayType MediaPlayerState::displayType() const | 88 | MediaPlayerState::DisplayType MediaPlayerState::displayType() const |
101 | { | 89 | { |
102 | return m_displayType; | 90 | return m_displayType; |
@@ -214,15 +202,6 @@ void MediaPlayerState::setLength( long l ) { | |||
214 | emit lengthChanged(l); | 202 | emit lengthChanged(l); |
215 | } | 203 | } |
216 | 204 | ||
217 | void 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 | |||
226 | void MediaPlayerState::setDisplayType( DisplayType displayType ) | 205 | void MediaPlayerState::setDisplayType( DisplayType displayType ) |
227 | { | 206 | { |
228 | if ( m_displayType == displayType ) | 207 | if ( m_displayType == displayType ) |
@@ -242,15 +221,15 @@ void MediaPlayerState::setNext() { | |||
242 | 221 | ||
243 | void MediaPlayerState::setList() { | 222 | void MediaPlayerState::setList() { |
244 | setPlaying( FALSE ); | 223 | setPlaying( FALSE ); |
245 | setView('l'); | 224 | setDisplayType( MediaSelection ); |
246 | } | 225 | } |
247 | 226 | ||
248 | void MediaPlayerState::setVideo() { | 227 | void MediaPlayerState::setVideo() { |
249 | setView('v'); | 228 | setDisplayType( Video ); |
250 | } | 229 | } |
251 | 230 | ||
252 | void MediaPlayerState::setAudio() { | 231 | void MediaPlayerState::setAudio() { |
253 | setView('a'); | 232 | setDisplayType( Audio ); |
254 | } | 233 | } |
255 | 234 | ||
256 | void MediaPlayerState::toggleFullscreen() { | 235 | void MediaPlayerState::toggleFullscreen() { |