-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayerstate.cpp | 8 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayerstate.h | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/noncore/multimedia/opieplayer2/mediaplayerstate.cpp b/noncore/multimedia/opieplayer2/mediaplayerstate.cpp index 0d21027..4f43465 100644 --- a/noncore/multimedia/opieplayer2/mediaplayerstate.cpp +++ b/noncore/multimedia/opieplayer2/mediaplayerstate.cpp | |||
@@ -151,57 +151,57 @@ void MediaPlayerState::setShuffled( bool b ) { | |||
151 | 151 | ||
152 | void MediaPlayerState::setPlaylist( bool b ) { | 152 | void MediaPlayerState::setPlaylist( bool b ) { |
153 | if ( usePlaylist == b ) { | 153 | if ( usePlaylist == b ) { |
154 | return; | 154 | return; |
155 | } | 155 | } |
156 | usePlaylist = b; | 156 | usePlaylist = b; |
157 | emit playlistToggled(b); | 157 | emit playlistToggled(b); |
158 | } | 158 | } |
159 | 159 | ||
160 | void MediaPlayerState::setPaused( bool b ) { | 160 | void MediaPlayerState::setPaused( bool b ) { |
161 | if ( paused == b ) { | 161 | if ( paused == b ) { |
162 | paused = FALSE; | 162 | paused = FALSE; |
163 | emit pausedToggled(FALSE); | 163 | emit pausedToggled(FALSE); |
164 | return; | 164 | return; |
165 | } | 165 | } |
166 | paused = b; | 166 | paused = b; |
167 | emit pausedToggled(b); | 167 | emit pausedToggled(b); |
168 | } | 168 | } |
169 | 169 | ||
170 | void MediaPlayerState::setPlaying( bool b ) { | 170 | void MediaPlayerState::setPlaying( bool b ) { |
171 | if ( playing == b ) { | 171 | if ( playing == b ) { |
172 | return; | 172 | return; |
173 | } | 173 | } |
174 | playing = b; | 174 | playing = b; |
175 | stoped = !b; | 175 | stopped = !b; |
176 | emit playingToggled(b); | 176 | emit playingToggled(b); |
177 | } | 177 | } |
178 | 178 | ||
179 | void MediaPlayerState::setStop( bool b ) { | 179 | void MediaPlayerState::setStopped( bool b ) { |
180 | if ( stoped == b ) { | 180 | if ( stopped == b ) { |
181 | return; | 181 | return; |
182 | } | 182 | } |
183 | stoped = b; | 183 | stopped = b; |
184 | emit stopToggled(b); | 184 | emit stopToggled(b); |
185 | } | 185 | } |
186 | 186 | ||
187 | void MediaPlayerState::setPosition( long p ) { | 187 | void MediaPlayerState::setPosition( long p ) { |
188 | if ( curPosition == p ) { | 188 | if ( curPosition == p ) { |
189 | return; | 189 | return; |
190 | } | 190 | } |
191 | curPosition = p; | 191 | curPosition = p; |
192 | emit positionChanged(p); | 192 | emit positionChanged(p); |
193 | } | 193 | } |
194 | 194 | ||
195 | void MediaPlayerState::updatePosition( long p ){ | 195 | void MediaPlayerState::updatePosition( long p ){ |
196 | if ( curPosition == p ) { | 196 | if ( curPosition == p ) { |
197 | return; | 197 | return; |
198 | } | 198 | } |
199 | curPosition = p; | 199 | curPosition = p; |
200 | emit positionUpdated(p); | 200 | emit positionUpdated(p); |
201 | } | 201 | } |
202 | 202 | ||
203 | void MediaPlayerState::setVideoGamma( int v ){ | 203 | void MediaPlayerState::setVideoGamma( int v ){ |
204 | if ( videoGamma == v ) { | 204 | if ( videoGamma == v ) { |
205 | return; | 205 | return; |
206 | } | 206 | } |
207 | videoGamma = v; | 207 | videoGamma = v; |
diff --git a/noncore/multimedia/opieplayer2/mediaplayerstate.h b/noncore/multimedia/opieplayer2/mediaplayerstate.h index 57189dd..04d0445 100644 --- a/noncore/multimedia/opieplayer2/mediaplayerstate.h +++ b/noncore/multimedia/opieplayer2/mediaplayerstate.h | |||
@@ -38,64 +38,64 @@ | |||
38 | 38 | ||
39 | 39 | ||
40 | #include <qobject.h> | 40 | #include <qobject.h> |
41 | 41 | ||
42 | 42 | ||
43 | class MediaPlayerDecoder; | 43 | class MediaPlayerDecoder; |
44 | class Config; | 44 | class Config; |
45 | 45 | ||
46 | 46 | ||
47 | class MediaPlayerState : public QObject { | 47 | class MediaPlayerState : public QObject { |
48 | Q_OBJECT | 48 | Q_OBJECT |
49 | public: | 49 | public: |
50 | MediaPlayerState( QObject *parent, const char *name ); | 50 | MediaPlayerState( QObject *parent, const char *name ); |
51 | ~MediaPlayerState(); | 51 | ~MediaPlayerState(); |
52 | 52 | ||
53 | bool isStreaming() const { return streaming; } | 53 | bool isStreaming() const { return streaming; } |
54 | bool isSeekable() const { return seekable; } | 54 | bool isSeekable() const { return seekable; } |
55 | bool isFullscreen() const { return fullscreen; } | 55 | bool isFullscreen() const { return fullscreen; } |
56 | bool isScaled() const { return scaled; } | 56 | bool isScaled() const { return scaled; } |
57 | bool isLooping() const { return looping; } | 57 | bool isLooping() const { return looping; } |
58 | bool isShuffled() const { return shuffled; } | 58 | bool isShuffled() const { return shuffled; } |
59 | bool isUsingPlaylist() const { return usePlaylist; } | 59 | bool isUsingPlaylist() const { return usePlaylist; } |
60 | bool isPaused() const { return paused; } | 60 | bool isPaused() const { return paused; } |
61 | bool isPlaying() const { return playing; } | 61 | bool isPlaying() const { return playing; } |
62 | bool isStop() const { return stoped; } | 62 | bool isStopped() const { return stopped; } |
63 | long position() const { return curPosition; } | 63 | long position() const { return curPosition; } |
64 | long length() const { return curLength; } | 64 | long length() const { return curLength; } |
65 | char view() const { return curView; } | 65 | char view() const { return curView; } |
66 | 66 | ||
67 | public slots: | 67 | public slots: |
68 | void setIsStreaming( bool b ); | 68 | void setIsStreaming( bool b ); |
69 | void setIsSeekable( bool b ); | 69 | void setIsSeekable( bool b ); |
70 | void setFullscreen( bool b ); | 70 | void setFullscreen( bool b ); |
71 | void setScaled( bool b ); | 71 | void setScaled( bool b ); |
72 | void setLooping( bool b ); | 72 | void setLooping( bool b ); |
73 | void setShuffled( bool b ); | 73 | void setShuffled( bool b ); |
74 | void setPlaylist( bool b ); | 74 | void setPlaylist( bool b ); |
75 | void setPaused( bool b ); | 75 | void setPaused( bool b ); |
76 | void setPlaying( bool b ); | 76 | void setPlaying( bool b ); |
77 | void setStop( bool b ); | 77 | void setStopped( bool b ); |
78 | void setPosition( long p ); | 78 | void setPosition( long p ); |
79 | void updatePosition( long p ); | 79 | void updatePosition( long p ); |
80 | void setLength( long l ); | 80 | void setLength( long l ); |
81 | void setView( char v ); | 81 | void setView( char v ); |
82 | void setBlanked( bool b ); | 82 | void setBlanked( bool b ); |
83 | void setVideoGamma( int v ); | 83 | void setVideoGamma( int v ); |
84 | 84 | ||
85 | void setPrev(); | 85 | void setPrev(); |
86 | void setNext(); | 86 | void setNext(); |
87 | void setList(); | 87 | void setList(); |
88 | void setVideo(); | 88 | void setVideo(); |
89 | void setAudio(); | 89 | void setAudio(); |
90 | 90 | ||
91 | void toggleFullscreen(); | 91 | void toggleFullscreen(); |
92 | void toggleScaled(); | 92 | void toggleScaled(); |
93 | void toggleLooping(); | 93 | void toggleLooping(); |
94 | void toggleShuffled(); | 94 | void toggleShuffled(); |
95 | void togglePlaylist(); | 95 | void togglePlaylist(); |
96 | void togglePaused(); | 96 | void togglePaused(); |
97 | void togglePlaying(); | 97 | void togglePlaying(); |
98 | void toggleBlank(); | 98 | void toggleBlank(); |
99 | void writeConfig( Config& cfg ) const; | 99 | void writeConfig( Config& cfg ) const; |
100 | 100 | ||
101 | 101 | ||
@@ -108,36 +108,36 @@ signals: | |||
108 | void pausedToggled( bool ); | 108 | void pausedToggled( bool ); |
109 | void playingToggled( bool ); | 109 | void playingToggled( bool ); |
110 | void stopToggled( bool ); | 110 | void stopToggled( bool ); |
111 | void positionChanged( long ); // When the slider is moved | 111 | void positionChanged( long ); // When the slider is moved |
112 | void positionUpdated( long ); // When the media file progresses | 112 | void positionUpdated( long ); // When the media file progresses |
113 | void lengthChanged( long ); | 113 | void lengthChanged( long ); |
114 | void viewChanged( char ); | 114 | void viewChanged( char ); |
115 | void isSeekableToggled( bool ); | 115 | void isSeekableToggled( bool ); |
116 | void blankToggled( bool ); | 116 | void blankToggled( bool ); |
117 | void videoGammaChanged( int ); | 117 | void videoGammaChanged( int ); |
118 | void prev(); | 118 | void prev(); |
119 | void next(); | 119 | void next(); |
120 | 120 | ||
121 | private: | 121 | private: |
122 | bool streaming; | 122 | bool streaming; |
123 | bool seekable; | 123 | bool seekable; |
124 | bool fullscreen; | 124 | bool fullscreen; |
125 | bool scaled; | 125 | bool scaled; |
126 | bool blanked; | 126 | bool blanked; |
127 | bool looping; | 127 | bool looping; |
128 | bool shuffled; | 128 | bool shuffled; |
129 | bool usePlaylist; | 129 | bool usePlaylist; |
130 | bool paused; | 130 | bool paused; |
131 | bool playing; | 131 | bool playing; |
132 | bool stoped; | 132 | bool stopped; |
133 | long curPosition; | 133 | long curPosition; |
134 | long curLength; | 134 | long curLength; |
135 | char curView; | 135 | char curView; |
136 | int videoGamma; | 136 | int videoGamma; |
137 | void readConfig( Config& cfg ); | 137 | void readConfig( Config& cfg ); |
138 | 138 | ||
139 | }; | 139 | }; |
140 | 140 | ||
141 | 141 | ||
142 | #endif // MEDIA_PLAYER_STATE_H | 142 | #endif // MEDIA_PLAYER_STATE_H |
143 | 143 | ||