author | simon <simon> | 2002-12-02 18:34:02 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-02 18:34:02 (UTC) |
commit | cf6d2e032faac6fbaeb9c5730767fc25021045fe (patch) (unidiff) | |
tree | 4a75af0170fec6b140ddf9ba7a2776f8e5a6427a /noncore/multimedia/opieplayer2/mediaplayerstate.cpp | |
parent | 2aa2e01cd678012d4b28365c9c765a2076f64a3b (diff) | |
download | opie-cf6d2e032faac6fbaeb9c5730767fc25021045fe.zip opie-cf6d2e032faac6fbaeb9c5730767fc25021045fe.tar.gz opie-cf6d2e032faac6fbaeb9c5730767fc25021045fe.tar.bz2 |
- oops, realized it's not MediaType but rather DisplayType
Diffstat (limited to 'noncore/multimedia/opieplayer2/mediaplayerstate.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayerstate.cpp | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/noncore/multimedia/opieplayer2/mediaplayerstate.cpp b/noncore/multimedia/opieplayer2/mediaplayerstate.cpp index 22451b7..6806adc 100644 --- a/noncore/multimedia/opieplayer2/mediaplayerstate.cpp +++ b/noncore/multimedia/opieplayer2/mediaplayerstate.cpp | |||
@@ -41,7 +41,7 @@ | |||
41 | #include <qdir.h> | 41 | #include <qdir.h> |
42 | #include "mediaplayerstate.h" | 42 | #include "mediaplayerstate.h" |
43 | 43 | ||
44 | 44 | #include <assert.h> | |
45 | 45 | ||
46 | //#define MediaPlayerDebug(x) qDebug x | 46 | //#define MediaPlayerDebug(x) qDebug x |
47 | #define MediaPlayerDebug(x) | 47 | #define MediaPlayerDebug(x) |
@@ -85,9 +85,17 @@ void MediaPlayerState::writeConfig( Config& cfg ) const { | |||
85 | cfg.writeEntry( "VideoGamma", videoGamma ); | 85 | cfg.writeEntry( "VideoGamma", videoGamma ); |
86 | } | 86 | } |
87 | 87 | ||
88 | MediaPlayerState::MediaType MediaPlayerState::mediaType() const | 88 | MediaPlayerState::DisplayType MediaPlayerState::displayType() const |
89 | { | 89 | { |
90 | return view() == 'a' ? MediaPlayerState::Audio : MediaPlayerState::Video; | 90 | char v = view(); |
91 | switch ( v ) { | ||
92 | case 'a': return MediaPlayerState::Audio; | ||
93 | case 'v': return MediaPlayerState::Video; | ||
94 | case 'l': return MediaPlayerState::MediaSelection; | ||
95 | default: assert( false ); | ||
96 | } | ||
97 | // never reached | ||
98 | return MediaPlayerState::MediaSelection; | ||
91 | } | 99 | } |
92 | 100 | ||
93 | // slots | 101 | // slots |
@@ -208,7 +216,7 @@ void MediaPlayerState::setView( char v ) { | |||
208 | } | 216 | } |
209 | curView = v; | 217 | curView = v; |
210 | emit viewChanged(v); | 218 | emit viewChanged(v); |
211 | emit mediaTypeChanged( mediaType() ); | 219 | emit displayTypeChanged( displayType() ); |
212 | } | 220 | } |
213 | 221 | ||
214 | void MediaPlayerState::setPrev(){ | 222 | void MediaPlayerState::setPrev(){ |