Diffstat (limited to 'noncore/multimedia/opieplayer2/mediaplayerstate.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayerstate.cpp | 39 |
1 files changed, 26 insertions, 13 deletions
diff --git a/noncore/multimedia/opieplayer2/mediaplayerstate.cpp b/noncore/multimedia/opieplayer2/mediaplayerstate.cpp index 6806adc..901b43f 100644 --- a/noncore/multimedia/opieplayer2/mediaplayerstate.cpp +++ b/noncore/multimedia/opieplayer2/mediaplayerstate.cpp | |||
@@ -73,5 +73,5 @@ void MediaPlayerState::readConfig( Config& cfg ) { | |||
73 | curPosition = 0; | 73 | curPosition = 0; |
74 | curLength = 0; | 74 | curLength = 0; |
75 | curView = 'l'; | 75 | m_displayType = MediaSelection; |
76 | } | 76 | } |
77 | 77 | ||
@@ -86,15 +86,19 @@ void MediaPlayerState::writeConfig( Config& cfg ) const { | |||
86 | } | 86 | } |
87 | 87 | ||
88 | MediaPlayerState::DisplayType MediaPlayerState::displayType() const | 88 | char MediaPlayerState::view() const |
89 | { | 89 | { |
90 | char v = view(); | 90 | switch ( m_displayType ) { |
91 | switch ( v ) { | 91 | case Audio: return 'a'; |
92 | case 'a': return MediaPlayerState::Audio; | 92 | case Video: return 'v'; |
93 | case 'v': return MediaPlayerState::Video; | 93 | case MediaSelection: return 'l'; |
94 | case 'l': return MediaPlayerState::MediaSelection; | ||
95 | default: assert( false ); | 94 | default: assert( false ); |
96 | } | 95 | } |
97 | // never reached | 96 | // never reached |
98 | return MediaPlayerState::MediaSelection; | 97 | return 42; |
98 | } | ||
99 | |||
100 | MediaPlayerState::DisplayType MediaPlayerState::displayType() const | ||
101 | { | ||
102 | return m_displayType; | ||
99 | } | 103 | } |
100 | 104 | ||
@@ -212,10 +216,19 @@ void MediaPlayerState::setLength( long l ) { | |||
212 | 216 | ||
213 | void MediaPlayerState::setView( char v ) { | 217 | void MediaPlayerState::setView( char v ) { |
214 | if ( curView == v ) { | 218 | switch ( v ) { |
215 | return; | 219 | case 'a': setDisplayType( Audio ); return; |
220 | case 'v': setDisplayType( Video ); return; | ||
221 | case 'l': setDisplayType( MediaSelection ); return; | ||
222 | default: assert( false ); | ||
216 | } | 223 | } |
217 | curView = v; | 224 | } |
218 | emit viewChanged(v); | 225 | |
219 | emit displayTypeChanged( displayType() ); | 226 | void MediaPlayerState::setDisplayType( DisplayType displayType ) |
227 | { | ||
228 | if ( m_displayType == displayType ) | ||
229 | return; | ||
230 | |||
231 | m_displayType = displayType; | ||
232 | emit displayTypeChanged( m_displayType ); | ||
220 | } | 233 | } |
221 | 234 | ||