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 | |||
@@ -32,25 +32,25 @@ | |||
32 | */ | 32 | */ |
33 | 33 | ||
34 | // this file is based on work by trolltech | 34 | // this file is based on work by trolltech |
35 | 35 | ||
36 | #include <qpe/qpeapplication.h> | 36 | #include <qpe/qpeapplication.h> |
37 | #include <qpe/qlibrary.h> | 37 | #include <qpe/qlibrary.h> |
38 | #include <qpe/config.h> | 38 | #include <qpe/config.h> |
39 | #include <qvaluelist.h> | 39 | #include <qvaluelist.h> |
40 | #include <qobject.h> | 40 | #include <qobject.h> |
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) |
48 | 48 | ||
49 | 49 | ||
50 | MediaPlayerState::MediaPlayerState( QObject *parent, const char *name ) | 50 | MediaPlayerState::MediaPlayerState( QObject *parent, const char *name ) |
51 | : QObject( parent, name ) { | 51 | : QObject( parent, name ) { |
52 | Config cfg( "OpiePlayer" ); | 52 | Config cfg( "OpiePlayer" ); |
53 | readConfig( cfg ); | 53 | readConfig( cfg ); |
54 | streaming = false; | 54 | streaming = false; |
55 | seekable = true; | 55 | seekable = true; |
56 | } | 56 | } |
@@ -76,27 +76,35 @@ void MediaPlayerState::readConfig( Config& cfg ) { | |||
76 | } | 76 | } |
77 | 77 | ||
78 | 78 | ||
79 | void MediaPlayerState::writeConfig( Config& cfg ) const { | 79 | void MediaPlayerState::writeConfig( Config& cfg ) const { |
80 | cfg.setGroup( "Options" ); | 80 | cfg.setGroup( "Options" ); |
81 | cfg.writeEntry( "FullScreen", fullscreen ); | 81 | cfg.writeEntry( "FullScreen", fullscreen ); |
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 | ||
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 |
94 | void MediaPlayerState::setIsStreaming( bool b ) { | 102 | void MediaPlayerState::setIsStreaming( bool b ) { |
95 | streaming = b; | 103 | streaming = b; |
96 | } | 104 | } |
97 | 105 | ||
98 | void MediaPlayerState::setIsSeekable( bool b ) { | 106 | void MediaPlayerState::setIsSeekable( bool b ) { |
99 | seekable = b; | 107 | seekable = b; |
100 | emit isSeekableToggled(b); | 108 | emit isSeekableToggled(b); |
101 | } | 109 | } |
102 | 110 | ||
@@ -199,25 +207,25 @@ void MediaPlayerState::setLength( long l ) { | |||
199 | return; | 207 | return; |
200 | } | 208 | } |
201 | curLength = l; | 209 | curLength = l; |
202 | emit lengthChanged(l); | 210 | emit lengthChanged(l); |
203 | } | 211 | } |
204 | 212 | ||
205 | void MediaPlayerState::setView( char v ) { | 213 | void MediaPlayerState::setView( char v ) { |
206 | if ( curView == v ) { | 214 | if ( curView == v ) { |
207 | return; | 215 | return; |
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(){ |
215 | emit prev(); | 223 | emit prev(); |
216 | } | 224 | } |
217 | 225 | ||
218 | void MediaPlayerState::setNext() { | 226 | void MediaPlayerState::setNext() { |
219 | emit next(); | 227 | emit next(); |
220 | } | 228 | } |
221 | 229 | ||
222 | void MediaPlayerState::setList() { | 230 | void MediaPlayerState::setList() { |
223 | setPlaying( FALSE ); | 231 | setPlaying( FALSE ); |