author | simon <simon> | 2002-12-02 13:46:23 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-02 13:46:23 (UTC) |
commit | b992707037f3bbf4573c52b34b3d25cbbf07bad0 (patch) (unidiff) | |
tree | b5a5866cda4b3e059001e3159cdae374777d4a72 | |
parent | 6e883bf60ea91cc6b0624c7307edc27ea3db291b (diff) | |
download | opie-b992707037f3bbf4573c52b34b3d25cbbf07bad0.zip opie-b992707037f3bbf4573c52b34b3d25cbbf07bad0.tar.gz opie-b992707037f3bbf4573c52b34b3d25cbbf07bad0.tar.bz2 |
- made the accessor functions constant
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayerstate.cpp | 26 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayerstate.h | 26 |
2 files changed, 26 insertions, 26 deletions
diff --git a/noncore/multimedia/opieplayer2/mediaplayerstate.cpp b/noncore/multimedia/opieplayer2/mediaplayerstate.cpp index 0b33dfd..a80d8fd 100644 --- a/noncore/multimedia/opieplayer2/mediaplayerstate.cpp +++ b/noncore/multimedia/opieplayer2/mediaplayerstate.cpp | |||
@@ -47,146 +47,146 @@ | |||
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 | isStreaming = false; | 54 | isStreaming = false; |
55 | isSeekable = true; | 55 | isSeekable = true; |
56 | } | 56 | } |
57 | 57 | ||
58 | 58 | ||
59 | MediaPlayerState::~MediaPlayerState() { | 59 | MediaPlayerState::~MediaPlayerState() { |
60 | } | 60 | } |
61 | 61 | ||
62 | 62 | ||
63 | void MediaPlayerState::readConfig( Config& cfg ) { | 63 | void MediaPlayerState::readConfig( Config& cfg ) { |
64 | cfg.setGroup("Options"); | 64 | cfg.setGroup("Options"); |
65 | isFullscreen = cfg.readBoolEntry( "FullScreen" ); | 65 | isFullscreen = cfg.readBoolEntry( "FullScreen" ); |
66 | isScaled = cfg.readBoolEntry( "Scaling" ); | 66 | isScaled = cfg.readBoolEntry( "Scaling" ); |
67 | isLooping = cfg.readBoolEntry( "Looping" ); | 67 | isLooping = cfg.readBoolEntry( "Looping" ); |
68 | isShuffled = cfg.readBoolEntry( "Shuffle" ); | 68 | isShuffled = cfg.readBoolEntry( "Shuffle" ); |
69 | usePlaylist = cfg.readBoolEntry( "UsePlayList" ); | 69 | usePlaylist = cfg.readBoolEntry( "UsePlayList" ); |
70 | videoGamma = cfg.readNumEntry( "VideoGamma" ); | 70 | videoGamma = cfg.readNumEntry( "VideoGamma" ); |
71 | usePlaylist = TRUE; | 71 | usePlaylist = TRUE; |
72 | isPlaying = FALSE; | 72 | isPlaying = FALSE; |
73 | isStreaming = FALSE; | 73 | isStreaming = FALSE; |
74 | isPaused = FALSE; | 74 | isPaused = FALSE; |
75 | curPosition = 0; | 75 | curPosition = 0; |
76 | curLength = 0; | 76 | curLength = 0; |
77 | curView = 'l'; | 77 | curView = 'l'; |
78 | } | 78 | } |
79 | 79 | ||
80 | 80 | ||
81 | void MediaPlayerState::writeConfig( Config& cfg ) const { | 81 | void MediaPlayerState::writeConfig( Config& cfg ) const { |
82 | cfg.setGroup( "Options" ); | 82 | cfg.setGroup( "Options" ); |
83 | cfg.writeEntry( "FullScreen", isFullscreen ); | 83 | cfg.writeEntry( "FullScreen", isFullscreen ); |
84 | cfg.writeEntry( "Scaling", isScaled ); | 84 | cfg.writeEntry( "Scaling", isScaled ); |
85 | cfg.writeEntry( "Looping", isLooping ); | 85 | cfg.writeEntry( "Looping", isLooping ); |
86 | cfg.writeEntry( "Shuffle", isShuffled ); | 86 | cfg.writeEntry( "Shuffle", isShuffled ); |
87 | cfg.writeEntry( "UsePlayList", usePlaylist ); | 87 | cfg.writeEntry( "UsePlayList", usePlaylist ); |
88 | cfg.writeEntry( "VideoGamma", videoGamma ); | 88 | cfg.writeEntry( "VideoGamma", videoGamma ); |
89 | } | 89 | } |
90 | 90 | ||
91 | 91 | ||
92 | // public stuff | 92 | // public stuff |
93 | 93 | ||
94 | 94 | ||
95 | bool MediaPlayerState::streaming() { | 95 | bool MediaPlayerState::streaming() const { |
96 | return isStreaming; | 96 | return isStreaming; |
97 | } | 97 | } |
98 | 98 | ||
99 | bool MediaPlayerState::seekable() { | 99 | bool MediaPlayerState::seekable() const { |
100 | return isSeekable; | 100 | return isSeekable; |
101 | } | 101 | } |
102 | 102 | ||
103 | bool MediaPlayerState::fullscreen() { | 103 | bool MediaPlayerState::fullscreen() const { |
104 | return isFullscreen; | 104 | return isFullscreen; |
105 | } | 105 | } |
106 | 106 | ||
107 | bool MediaPlayerState::scaled() { | 107 | bool MediaPlayerState::scaled() const { |
108 | return isScaled; | 108 | return isScaled; |
109 | } | 109 | } |
110 | 110 | ||
111 | bool MediaPlayerState::looping() { | 111 | bool MediaPlayerState::looping() const { |
112 | return isLooping; | 112 | return isLooping; |
113 | } | 113 | } |
114 | 114 | ||
115 | bool MediaPlayerState::shuffled() { | 115 | bool MediaPlayerState::shuffled() const { |
116 | return isShuffled; | 116 | return isShuffled; |
117 | } | 117 | } |
118 | 118 | ||
119 | 119 | ||
120 | bool MediaPlayerState::playlist() { | 120 | bool MediaPlayerState::playlist() const { |
121 | return usePlaylist; | 121 | return usePlaylist; |
122 | } | 122 | } |
123 | 123 | ||
124 | bool MediaPlayerState::paused() { | 124 | bool MediaPlayerState::paused() const { |
125 | return isPaused; | 125 | return isPaused; |
126 | } | 126 | } |
127 | 127 | ||
128 | bool MediaPlayerState::playing() { | 128 | bool MediaPlayerState::playing() const { |
129 | return isPlaying; | 129 | return isPlaying; |
130 | } | 130 | } |
131 | 131 | ||
132 | bool MediaPlayerState::stop() { | 132 | bool MediaPlayerState::stop() const { |
133 | return isStoped; | 133 | return isStoped; |
134 | } | 134 | } |
135 | 135 | ||
136 | long MediaPlayerState::position() { | 136 | long MediaPlayerState::position() const { |
137 | return curPosition; | 137 | return curPosition; |
138 | } | 138 | } |
139 | 139 | ||
140 | long MediaPlayerState::length() { | 140 | long MediaPlayerState::length() const { |
141 | return curLength; | 141 | return curLength; |
142 | } | 142 | } |
143 | 143 | ||
144 | char MediaPlayerState::view() { | 144 | char MediaPlayerState::view() const { |
145 | return curView; | 145 | return curView; |
146 | } | 146 | } |
147 | 147 | ||
148 | // slots | 148 | // slots |
149 | void MediaPlayerState::setIsStreaming( bool b ) { | 149 | void MediaPlayerState::setIsStreaming( bool b ) { |
150 | 150 | ||
151 | if ( isStreaming == b ) { | 151 | if ( isStreaming == b ) { |
152 | return; | 152 | return; |
153 | } | 153 | } |
154 | isStreaming = b; | 154 | isStreaming = b; |
155 | } | 155 | } |
156 | 156 | ||
157 | void MediaPlayerState::setIsSeekable( bool b ) { | 157 | void MediaPlayerState::setIsSeekable( bool b ) { |
158 | 158 | ||
159 | //if ( isSeekable == b ) { | 159 | //if ( isSeekable == b ) { |
160 | // return; | 160 | // return; |
161 | // } | 161 | // } |
162 | isSeekable = b; | 162 | isSeekable = b; |
163 | emit isSeekableToggled(b); | 163 | emit isSeekableToggled(b); |
164 | } | 164 | } |
165 | 165 | ||
166 | 166 | ||
167 | void MediaPlayerState::setFullscreen( bool b ) { | 167 | void MediaPlayerState::setFullscreen( bool b ) { |
168 | if ( isFullscreen == b ) { | 168 | if ( isFullscreen == b ) { |
169 | return; | 169 | return; |
170 | } | 170 | } |
171 | isFullscreen = b; | 171 | isFullscreen = b; |
172 | emit fullscreenToggled(b); | 172 | emit fullscreenToggled(b); |
173 | } | 173 | } |
174 | 174 | ||
175 | 175 | ||
176 | void MediaPlayerState::setBlanked( bool b ) { | 176 | void MediaPlayerState::setBlanked( bool b ) { |
177 | if ( isBlanked == b ) { | 177 | if ( isBlanked == b ) { |
178 | return; | 178 | return; |
179 | } | 179 | } |
180 | isBlanked = b; | 180 | isBlanked = b; |
181 | emit blankToggled(b); | 181 | emit blankToggled(b); |
182 | } | 182 | } |
183 | 183 | ||
184 | 184 | ||
185 | void MediaPlayerState::setScaled( bool b ) { | 185 | void MediaPlayerState::setScaled( bool b ) { |
186 | if ( isScaled == b ) { | 186 | if ( isScaled == b ) { |
187 | return; | 187 | return; |
188 | } | 188 | } |
189 | isScaled = b; | 189 | isScaled = b; |
190 | emit scaledToggled(b); | 190 | emit scaledToggled(b); |
191 | } | 191 | } |
192 | 192 | ||
diff --git a/noncore/multimedia/opieplayer2/mediaplayerstate.h b/noncore/multimedia/opieplayer2/mediaplayerstate.h index 154e3b0..f9c1eeb 100644 --- a/noncore/multimedia/opieplayer2/mediaplayerstate.h +++ b/noncore/multimedia/opieplayer2/mediaplayerstate.h | |||
@@ -5,109 +5,109 @@ | |||
5 | Copyright (c) 2002 L. Potter <ljp@llornkcor.com> | 5 | Copyright (c) 2002 L. Potter <ljp@llornkcor.com> |
6 | Copyright (c) 2002 Holger Freyther <zecke@handhelds.org> | 6 | Copyright (c) 2002 Holger Freyther <zecke@handhelds.org> |
7 | =. | 7 | =. |
8 | .=l. | 8 | .=l. |
9 | .>+-= | 9 | .>+-= |
10 | _;:, .> :=|. This program is free software; you can | 10 | _;:, .> :=|. This program is free software; you can |
11 | .> <`_, > . <= redistribute it and/or modify it under | 11 | .> <`_, > . <= redistribute it and/or modify it under |
12 | :`=1 )Y*s>-.-- : the terms of the GNU General Public | 12 | :`=1 )Y*s>-.-- : the terms of the GNU General Public |
13 | .="- .-=="i, .._ License as published by the Free Software | 13 | .="- .-=="i, .._ License as published by the Free Software |
14 | - . .-<_> .<> Foundation; either version 2 of the License, | 14 | - . .-<_> .<> Foundation; either version 2 of the License, |
15 | ._= =} : or (at your option) any later version. | 15 | ._= =} : or (at your option) any later version. |
16 | .%`+i> _;_. | 16 | .%`+i> _;_. |
17 | .i_,=:_. -<s. This program is distributed in the hope that | 17 | .i_,=:_. -<s. This program is distributed in the hope that |
18 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 18 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
19 | : .. .:, . . . without even the implied warranty of | 19 | : .. .:, . . . without even the implied warranty of |
20 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 20 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
21 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 21 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
22 | ..}^=.= = ; General Public License for more | 22 | ..}^=.= = ; General Public License for more |
23 | ++= -. .` .: details. | 23 | ++= -. .` .: details. |
24 | : = ...= . :.=- | 24 | : = ...= . :.=- |
25 | -. .:....=;==+<; You should have received a copy of the GNU | 25 | -. .:....=;==+<; You should have received a copy of the GNU |
26 | -_. . . )=. = General Public License along with | 26 | -_. . . )=. = General Public License along with |
27 | -- :-=` this library; see the file COPYING.LIB. | 27 | -- :-=` this library; see the file COPYING.LIB. |
28 | If not, write to the Free Software Foundation, | 28 | If not, write to the Free Software Foundation, |
29 | Inc., 59 Temple Place - Suite 330, | 29 | Inc., 59 Temple Place - Suite 330, |
30 | Boston, MA 02111-1307, USA. | 30 | Boston, MA 02111-1307, USA. |
31 | 31 | ||
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 | #ifndef MEDIA_PLAYER_STATE_H | 36 | #ifndef MEDIA_PLAYER_STATE_H |
37 | #define MEDIA_PLAYER_STATE_H | 37 | #define MEDIA_PLAYER_STATE_H |
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 streaming(); | 53 | bool streaming() const; |
54 | bool seekable(); | 54 | bool seekable() const; |
55 | bool fullscreen(); | 55 | bool fullscreen() const; |
56 | bool scaled(); | 56 | bool scaled() const; |
57 | bool looping(); | 57 | bool looping() const; |
58 | bool shuffled(); | 58 | bool shuffled() const; |
59 | bool playlist(); | 59 | bool playlist() const; |
60 | bool paused(); | 60 | bool paused() const; |
61 | bool playing(); | 61 | bool playing() const; |
62 | bool stop(); | 62 | bool stop() const; |
63 | long position(); | 63 | long position() const; |
64 | long length(); | 64 | long length() const; |
65 | char view(); | 65 | char view() const; |
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 setStop( 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 | ||
102 | signals: | 102 | signals: |
103 | void fullscreenToggled( bool ); | 103 | void fullscreenToggled( bool ); |
104 | void scaledToggled( bool ); | 104 | void scaledToggled( bool ); |
105 | void loopingToggled( bool ); | 105 | void loopingToggled( bool ); |
106 | void shuffledToggled( bool ); | 106 | void shuffledToggled( bool ); |
107 | void playlistToggled( bool ); | 107 | void playlistToggled( bool ); |
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 ); |