author | simon <simon> | 2002-12-02 13:47:10 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-02 13:47:10 (UTC) |
commit | 1646c471d8a1f54df65c8d58402bc80af004f498 (patch) (unidiff) | |
tree | e6697a36c96e7d1c7295e46bea5a6847fe2e22ec /noncore/multimedia/opieplayer2 | |
parent | b992707037f3bbf4573c52b34b3d25cbbf07bad0 (diff) | |
download | opie-1646c471d8a1f54df65c8d58402bc80af004f498.zip opie-1646c471d8a1f54df65c8d58402bc80af004f498.tar.gz opie-1646c471d8a1f54df65c8d58402bc80af004f498.tar.bz2 |
- paused() -> isPaused() and the like for all accessor functions in the
mediaplayerstate class
Diffstat (limited to 'noncore/multimedia/opieplayer2') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 10 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayer.cpp | 12 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayerstate.cpp | 120 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayerstate.h | 40 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidget.cpp | 36 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 20 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/xinecontrol.cpp | 2 |
7 files changed, 120 insertions, 120 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp index a52319b..7c2b007 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.cpp +++ b/noncore/multimedia/opieplayer2/audiowidget.cpp | |||
@@ -175,5 +175,5 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) : | |||
175 | setPosition( mediaPlayerState->position() ); | 175 | setPosition( mediaPlayerState->position() ); |
176 | setLooping( mediaPlayerState->fullscreen() ); | 176 | setLooping( mediaPlayerState->isFullscreen() ); |
177 | // setPaused( mediaPlayerState->paused() ); | 177 | // setPaused( mediaPlayerState->paused() ); |
178 | setPlaying( mediaPlayerState->playing() ); | 178 | setPlaying( mediaPlayerState->isPlaying() ); |
179 | 179 | ||
@@ -433,6 +433,6 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
433 | case AudioPlay: | 433 | case AudioPlay: |
434 | if( mediaPlayerState->paused() ) { | 434 | if( mediaPlayerState->isPaused() ) { |
435 | mediaPlayerState->setPaused( FALSE ); | 435 | mediaPlayerState->setPaused( FALSE ); |
436 | return; | 436 | return; |
437 | } else if( !mediaPlayerState->paused() ) { | 437 | } else if( !mediaPlayerState->isPaused() ) { |
438 | mediaPlayerState->setPaused( TRUE ); | 438 | mediaPlayerState->setPaused( TRUE ); |
@@ -515,3 +515,3 @@ void AudioWidget::keyReleaseEvent( QKeyEvent *e) { | |||
515 | case Key_Space: { | 515 | case Key_Space: { |
516 | if(mediaPlayerState->playing()) { | 516 | if(mediaPlayerState->isPlaying()) { |
517 | // toggleButton(1); | 517 | // toggleButton(1); |
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp index 1f19b30..8136ff1 100644 --- a/noncore/multimedia/opieplayer2/mediaplayer.cpp +++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp | |||
@@ -76,3 +76,3 @@ MediaPlayer::~MediaPlayer() { | |||
76 | void MediaPlayer::pauseCheck( bool b ) { | 76 | void MediaPlayer::pauseCheck( bool b ) { |
77 | if ( b && !mediaPlayerState->playing() ) { | 77 | if ( b && !mediaPlayerState->isPlaying() ) { |
78 | mediaPlayerState->setPaused( FALSE ); | 78 | mediaPlayerState->setPaused( FALSE ); |
@@ -91,3 +91,3 @@ void MediaPlayer::setPlaying( bool play ) { | |||
91 | 91 | ||
92 | if ( mediaPlayerState->paused() ) { | 92 | if ( mediaPlayerState->isPaused() ) { |
93 | mediaPlayerState->setPaused( FALSE ); | 93 | mediaPlayerState->setPaused( FALSE ); |
@@ -113,3 +113,3 @@ void MediaPlayer::setPlaying( bool play ) { | |||
113 | // so we remember and shutoff | 113 | // so we remember and shutoff |
114 | l = mediaPlayerState->looping(); | 114 | l = mediaPlayerState->isLooping(); |
115 | if(l) { | 115 | if(l) { |
@@ -117,3 +117,3 @@ void MediaPlayer::setPlaying( bool play ) { | |||
117 | } | 117 | } |
118 | r = mediaPlayerState->shuffled(); | 118 | r = mediaPlayerState->isShuffled(); |
119 | mediaPlayerState->setShuffled( false ); | 119 | mediaPlayerState->setShuffled( false ); |
@@ -152,3 +152,3 @@ void MediaPlayer::prev() { | |||
152 | play(); | 152 | play(); |
153 | } else if ( mediaPlayerState->looping() ) { | 153 | } else if ( mediaPlayerState->isLooping() ) { |
154 | if ( playList->last() ) { | 154 | if ( playList->last() ) { |
@@ -168,3 +168,3 @@ void MediaPlayer::next() { | |||
168 | play(); | 168 | play(); |
169 | } else if ( mediaPlayerState->looping() ) { | 169 | } else if ( mediaPlayerState->isLooping() ) { |
170 | if ( playList->first() ) { | 170 | if ( playList->first() ) { |
diff --git a/noncore/multimedia/opieplayer2/mediaplayerstate.cpp b/noncore/multimedia/opieplayer2/mediaplayerstate.cpp index a80d8fd..85d9bac 100644 --- a/noncore/multimedia/opieplayer2/mediaplayerstate.cpp +++ b/noncore/multimedia/opieplayer2/mediaplayerstate.cpp | |||
@@ -53,4 +53,4 @@ MediaPlayerState::MediaPlayerState( QObject *parent, const char *name ) | |||
53 | readConfig( cfg ); | 53 | readConfig( cfg ); |
54 | isStreaming = false; | 54 | streaming = false; |
55 | isSeekable = true; | 55 | seekable = true; |
56 | } | 56 | } |
@@ -64,6 +64,6 @@ void MediaPlayerState::readConfig( Config& cfg ) { | |||
64 | cfg.setGroup("Options"); | 64 | cfg.setGroup("Options"); |
65 | isFullscreen = cfg.readBoolEntry( "FullScreen" ); | 65 | fullscreen = cfg.readBoolEntry( "FullScreen" ); |
66 | isScaled = cfg.readBoolEntry( "Scaling" ); | 66 | scaled = cfg.readBoolEntry( "Scaling" ); |
67 | isLooping = cfg.readBoolEntry( "Looping" ); | 67 | looping = cfg.readBoolEntry( "Looping" ); |
68 | isShuffled = cfg.readBoolEntry( "Shuffle" ); | 68 | shuffled = cfg.readBoolEntry( "Shuffle" ); |
69 | usePlaylist = cfg.readBoolEntry( "UsePlayList" ); | 69 | usePlaylist = cfg.readBoolEntry( "UsePlayList" ); |
@@ -71,5 +71,5 @@ void MediaPlayerState::readConfig( Config& cfg ) { | |||
71 | usePlaylist = TRUE; | 71 | usePlaylist = TRUE; |
72 | isPlaying = FALSE; | 72 | playing = FALSE; |
73 | isStreaming = FALSE; | 73 | streaming = FALSE; |
74 | isPaused = FALSE; | 74 | paused = FALSE; |
75 | curPosition = 0; | 75 | curPosition = 0; |
@@ -82,6 +82,6 @@ void MediaPlayerState::writeConfig( Config& cfg ) const { | |||
82 | cfg.setGroup( "Options" ); | 82 | cfg.setGroup( "Options" ); |
83 | cfg.writeEntry( "FullScreen", isFullscreen ); | 83 | cfg.writeEntry( "FullScreen", fullscreen ); |
84 | cfg.writeEntry( "Scaling", isScaled ); | 84 | cfg.writeEntry( "Scaling", scaled ); |
85 | cfg.writeEntry( "Looping", isLooping ); | 85 | cfg.writeEntry( "Looping", looping ); |
86 | cfg.writeEntry( "Shuffle", isShuffled ); | 86 | cfg.writeEntry( "Shuffle", shuffled ); |
87 | cfg.writeEntry( "UsePlayList", usePlaylist ); | 87 | cfg.writeEntry( "UsePlayList", usePlaylist ); |
@@ -94,24 +94,24 @@ void MediaPlayerState::writeConfig( Config& cfg ) const { | |||
94 | 94 | ||
95 | bool MediaPlayerState::streaming() const { | 95 | bool MediaPlayerState::isStreaming() const { |
96 | return isStreaming; | 96 | return streaming; |
97 | } | 97 | } |
98 | 98 | ||
99 | bool MediaPlayerState::seekable() const { | 99 | bool MediaPlayerState::isSeekable() const { |
100 | return isSeekable; | 100 | return seekable; |
101 | } | 101 | } |
102 | 102 | ||
103 | bool MediaPlayerState::fullscreen() const { | 103 | bool MediaPlayerState::isFullscreen() const { |
104 | return isFullscreen; | 104 | return fullscreen; |
105 | } | 105 | } |
106 | 106 | ||
107 | bool MediaPlayerState::scaled() const { | 107 | bool MediaPlayerState::isScaled() const { |
108 | return isScaled; | 108 | return scaled; |
109 | } | 109 | } |
110 | 110 | ||
111 | bool MediaPlayerState::looping() const { | 111 | bool MediaPlayerState::isLooping() const { |
112 | return isLooping; | 112 | return looping; |
113 | } | 113 | } |
114 | 114 | ||
115 | bool MediaPlayerState::shuffled() const { | 115 | bool MediaPlayerState::isShuffled() const { |
116 | return isShuffled; | 116 | return shuffled; |
117 | } | 117 | } |
@@ -119,3 +119,3 @@ bool MediaPlayerState::shuffled() const { | |||
119 | 119 | ||
120 | bool MediaPlayerState::playlist() const { | 120 | bool MediaPlayerState::isUsingPlaylist() const { |
121 | return usePlaylist; | 121 | return usePlaylist; |
@@ -123,12 +123,12 @@ bool MediaPlayerState::playlist() const { | |||
123 | 123 | ||
124 | bool MediaPlayerState::paused() const { | 124 | bool MediaPlayerState::isPaused() const { |
125 | return isPaused; | 125 | return paused; |
126 | } | 126 | } |
127 | 127 | ||
128 | bool MediaPlayerState::playing() const { | 128 | bool MediaPlayerState::isPlaying() const { |
129 | return isPlaying; | 129 | return playing; |
130 | } | 130 | } |
131 | 131 | ||
132 | bool MediaPlayerState::stop() const { | 132 | bool MediaPlayerState::isStop() const { |
133 | return isStoped; | 133 | return stoped; |
134 | } | 134 | } |
@@ -150,6 +150,6 @@ void MediaPlayerState::setIsStreaming( bool b ) { | |||
150 | 150 | ||
151 | if ( isStreaming == b ) { | 151 | if ( streaming == b ) { |
152 | return; | 152 | return; |
153 | } | 153 | } |
154 | isStreaming = b; | 154 | streaming = b; |
155 | } | 155 | } |
@@ -161,3 +161,3 @@ void MediaPlayerState::setIsSeekable( bool b ) { | |||
161 | // } | 161 | // } |
162 | isSeekable = b; | 162 | seekable = b; |
163 | emit isSeekableToggled(b); | 163 | emit isSeekableToggled(b); |
@@ -167,6 +167,6 @@ void MediaPlayerState::setIsSeekable( bool b ) { | |||
167 | void MediaPlayerState::setFullscreen( bool b ) { | 167 | void MediaPlayerState::setFullscreen( bool b ) { |
168 | if ( isFullscreen == b ) { | 168 | if ( fullscreen == b ) { |
169 | return; | 169 | return; |
170 | } | 170 | } |
171 | isFullscreen = b; | 171 | fullscreen = b; |
172 | emit fullscreenToggled(b); | 172 | emit fullscreenToggled(b); |
@@ -176,6 +176,6 @@ void MediaPlayerState::setFullscreen( bool b ) { | |||
176 | void MediaPlayerState::setBlanked( bool b ) { | 176 | void MediaPlayerState::setBlanked( bool b ) { |
177 | if ( isBlanked == b ) { | 177 | if ( blanked == b ) { |
178 | return; | 178 | return; |
179 | } | 179 | } |
180 | isBlanked = b; | 180 | blanked = b; |
181 | emit blankToggled(b); | 181 | emit blankToggled(b); |
@@ -185,6 +185,6 @@ void MediaPlayerState::setBlanked( bool b ) { | |||
185 | void MediaPlayerState::setScaled( bool b ) { | 185 | void MediaPlayerState::setScaled( bool b ) { |
186 | if ( isScaled == b ) { | 186 | if ( scaled == b ) { |
187 | return; | 187 | return; |
188 | } | 188 | } |
189 | isScaled = b; | 189 | scaled = b; |
190 | emit scaledToggled(b); | 190 | emit scaledToggled(b); |
@@ -193,6 +193,6 @@ void MediaPlayerState::setScaled( bool b ) { | |||
193 | void MediaPlayerState::setLooping( bool b ) { | 193 | void MediaPlayerState::setLooping( bool b ) { |
194 | if ( isLooping == b ) { | 194 | if ( looping == b ) { |
195 | return; | 195 | return; |
196 | } | 196 | } |
197 | isLooping = b; | 197 | looping = b; |
198 | emit loopingToggled(b); | 198 | emit loopingToggled(b); |
@@ -201,6 +201,6 @@ void MediaPlayerState::setLooping( bool b ) { | |||
201 | void MediaPlayerState::setShuffled( bool b ) { | 201 | void MediaPlayerState::setShuffled( bool b ) { |
202 | if ( isShuffled == b ) { | 202 | if ( shuffled == b ) { |
203 | return; | 203 | return; |
204 | } | 204 | } |
205 | isShuffled = b; | 205 | shuffled = b; |
206 | emit shuffledToggled(b); | 206 | emit shuffledToggled(b); |
@@ -217,4 +217,4 @@ void MediaPlayerState::setPlaylist( bool b ) { | |||
217 | void MediaPlayerState::setPaused( bool b ) { | 217 | void MediaPlayerState::setPaused( bool b ) { |
218 | if ( isPaused == b ) { | 218 | if ( paused == b ) { |
219 | isPaused = FALSE; | 219 | paused = FALSE; |
220 | emit pausedToggled(FALSE); | 220 | emit pausedToggled(FALSE); |
@@ -222,3 +222,3 @@ void MediaPlayerState::setPaused( bool b ) { | |||
222 | } | 222 | } |
223 | isPaused = b; | 223 | paused = b; |
224 | emit pausedToggled(b); | 224 | emit pausedToggled(b); |
@@ -227,7 +227,7 @@ void MediaPlayerState::setPaused( bool b ) { | |||
227 | void MediaPlayerState::setPlaying( bool b ) { | 227 | void MediaPlayerState::setPlaying( bool b ) { |
228 | if ( isPlaying == b ) { | 228 | if ( playing == b ) { |
229 | return; | 229 | return; |
230 | } | 230 | } |
231 | isPlaying = b; | 231 | playing = b; |
232 | isStoped = !b; | 232 | stoped = !b; |
233 | emit playingToggled(b); | 233 | emit playingToggled(b); |
@@ -236,6 +236,6 @@ void MediaPlayerState::setPlaying( bool b ) { | |||
236 | void MediaPlayerState::setStop( bool b ) { | 236 | void MediaPlayerState::setStop( bool b ) { |
237 | if ( isStoped == b ) { | 237 | if ( stoped == b ) { |
238 | return; | 238 | return; |
239 | } | 239 | } |
240 | isStoped = b; | 240 | stoped = b; |
241 | emit stopToggled(b); | 241 | emit stopToggled(b); |
@@ -305,3 +305,3 @@ void MediaPlayerState::setAudio() { | |||
305 | void MediaPlayerState::toggleFullscreen() { | 305 | void MediaPlayerState::toggleFullscreen() { |
306 | setFullscreen( !isFullscreen ); | 306 | setFullscreen( !fullscreen ); |
307 | } | 307 | } |
@@ -309,3 +309,3 @@ void MediaPlayerState::toggleFullscreen() { | |||
309 | void MediaPlayerState::toggleScaled() { | 309 | void MediaPlayerState::toggleScaled() { |
310 | setScaled( !isScaled); | 310 | setScaled( !scaled); |
311 | } | 311 | } |
@@ -313,3 +313,3 @@ void MediaPlayerState::toggleScaled() { | |||
313 | void MediaPlayerState::toggleLooping() { | 313 | void MediaPlayerState::toggleLooping() { |
314 | setLooping( !isLooping); | 314 | setLooping( !looping); |
315 | } | 315 | } |
@@ -317,3 +317,3 @@ void MediaPlayerState::toggleLooping() { | |||
317 | void MediaPlayerState::toggleShuffled() { | 317 | void MediaPlayerState::toggleShuffled() { |
318 | setShuffled( !isShuffled); | 318 | setShuffled( !shuffled); |
319 | } | 319 | } |
@@ -325,3 +325,3 @@ void MediaPlayerState::togglePlaylist() { | |||
325 | void MediaPlayerState::togglePaused() { | 325 | void MediaPlayerState::togglePaused() { |
326 | setPaused( !isPaused); | 326 | setPaused( !paused); |
327 | } | 327 | } |
@@ -329,3 +329,3 @@ void MediaPlayerState::togglePaused() { | |||
329 | void MediaPlayerState::togglePlaying() { | 329 | void MediaPlayerState::togglePlaying() { |
330 | setPlaying( !isPlaying); | 330 | setPlaying( !playing); |
331 | } | 331 | } |
@@ -333,3 +333,3 @@ void MediaPlayerState::togglePlaying() { | |||
333 | void MediaPlayerState::toggleBlank() { | 333 | void MediaPlayerState::toggleBlank() { |
334 | setBlanked( !isBlanked); | 334 | setBlanked( !blanked); |
335 | } | 335 | } |
diff --git a/noncore/multimedia/opieplayer2/mediaplayerstate.h b/noncore/multimedia/opieplayer2/mediaplayerstate.h index f9c1eeb..4e837e3 100644 --- a/noncore/multimedia/opieplayer2/mediaplayerstate.h +++ b/noncore/multimedia/opieplayer2/mediaplayerstate.h | |||
@@ -52,12 +52,12 @@ public: | |||
52 | 52 | ||
53 | bool streaming() const; | 53 | bool isStreaming() const; |
54 | bool seekable() const; | 54 | bool isSeekable() const; |
55 | bool fullscreen() const; | 55 | bool isFullscreen() const; |
56 | bool scaled() const; | 56 | bool isScaled() const; |
57 | bool looping() const; | 57 | bool isLooping() const; |
58 | bool shuffled() const; | 58 | bool isShuffled() const; |
59 | bool playlist() const; | 59 | bool isUsingPlaylist() const; |
60 | bool paused() const; | 60 | bool isPaused() const; |
61 | bool playing() const; | 61 | bool isPlaying() const; |
62 | bool stop() const; | 62 | bool isStop() const; |
63 | long position() const; | 63 | long position() const; |
@@ -121,13 +121,13 @@ signals: | |||
121 | private: | 121 | private: |
122 | bool isStreaming; | 122 | bool streaming; |
123 | bool isSeekable; | 123 | bool seekable; |
124 | bool isFullscreen; | 124 | bool fullscreen; |
125 | bool isScaled; | 125 | bool scaled; |
126 | bool isBlanked; | 126 | bool blanked; |
127 | bool isLooping; | 127 | bool looping; |
128 | bool isShuffled; | 128 | bool shuffled; |
129 | bool usePlaylist; | 129 | bool usePlaylist; |
130 | bool isPaused; | 130 | bool paused; |
131 | bool isPlaying; | 131 | bool playing; |
132 | bool isStoped; | 132 | bool stoped; |
133 | long curPosition; | 133 | long curPosition; |
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp index 593f072..d1506db 100644 --- a/noncore/multimedia/opieplayer2/playlistwidget.cpp +++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp | |||
@@ -178,5 +178,5 @@ PlayListWidget::~PlayListWidget() { | |||
178 | void PlayListWidget::initializeStates() { | 178 | void PlayListWidget::initializeStates() { |
179 | d->tbPlay->setOn( mediaPlayerState->playing() ); | 179 | d->tbPlay->setOn( mediaPlayerState->isPlaying() ); |
180 | d->tbLoop->setOn( mediaPlayerState->looping() ); | 180 | d->tbLoop->setOn( mediaPlayerState->isLooping() ); |
181 | d->tbShuffle->setOn( mediaPlayerState->shuffled() ); | 181 | d->tbShuffle->setOn( mediaPlayerState->isShuffled() ); |
182 | setPlaylist( true ); | 182 | setPlaylist( true ); |
@@ -211,3 +211,3 @@ void PlayListWidget::addToSelection( const DocLnk& lnk ) { | |||
211 | d->setDocumentUsed = FALSE; | 211 | d->setDocumentUsed = FALSE; |
212 | if ( mediaPlayerState->playlist() ) { | 212 | if ( mediaPlayerState->isUsingPlaylist() ) { |
213 | if( QFileInfo( lnk.file() ).exists() || | 213 | if( QFileInfo( lnk.file() ).exists() || |
@@ -430,3 +430,3 @@ const DocLnk *PlayListWidget::current() { // this is fugly | |||
430 | // qDebug("playlist"); | 430 | // qDebug("playlist"); |
431 | if ( mediaPlayerState->playlist() ) { | 431 | if ( mediaPlayerState->isUsingPlaylist() ) { |
432 | return d->selectedFiles->current(); | 432 | return d->selectedFiles->current(); |
@@ -445,4 +445,4 @@ const DocLnk *PlayListWidget::current() { // this is fugly | |||
445 | bool PlayListWidget::prev() { | 445 | bool PlayListWidget::prev() { |
446 | if ( mediaPlayerState->playlist() ) { | 446 | if ( mediaPlayerState->isUsingPlaylist() ) { |
447 | if ( mediaPlayerState->shuffled() ) { | 447 | if ( mediaPlayerState->isShuffled() ) { |
448 | const DocLnk *cur = current(); | 448 | const DocLnk *cur = current(); |
@@ -460,3 +460,3 @@ bool PlayListWidget::prev() { | |||
460 | if ( !d->selectedFiles->prev() ) { | 460 | if ( !d->selectedFiles->prev() ) { |
461 | if ( mediaPlayerState->looping() ) { | 461 | if ( mediaPlayerState->isLooping() ) { |
462 | return d->selectedFiles->last(); | 462 | return d->selectedFiles->last(); |
@@ -469,3 +469,3 @@ bool PlayListWidget::prev() { | |||
469 | } else { | 469 | } else { |
470 | return mediaPlayerState->looping(); | 470 | return mediaPlayerState->isLooping(); |
471 | } | 471 | } |
@@ -476,4 +476,4 @@ bool PlayListWidget::next() { | |||
476 | //qDebug("<<<<<<<<<<<<next()"); | 476 | //qDebug("<<<<<<<<<<<<next()"); |
477 | if ( mediaPlayerState->playlist() ) { | 477 | if ( mediaPlayerState->isUsingPlaylist() ) { |
478 | if ( mediaPlayerState->shuffled() ) { | 478 | if ( mediaPlayerState->isShuffled() ) { |
479 | return prev(); | 479 | return prev(); |
@@ -481,3 +481,3 @@ bool PlayListWidget::next() { | |||
481 | if ( !d->selectedFiles->next() ) { | 481 | if ( !d->selectedFiles->next() ) { |
482 | if ( mediaPlayerState->looping() ) { | 482 | if ( mediaPlayerState->isLooping() ) { |
483 | return d->selectedFiles->first(); | 483 | return d->selectedFiles->first(); |
@@ -490,3 +490,3 @@ bool PlayListWidget::next() { | |||
490 | } else { | 490 | } else { |
491 | return mediaPlayerState->looping(); | 491 | return mediaPlayerState->isLooping(); |
492 | } | 492 | } |
@@ -496,6 +496,6 @@ bool PlayListWidget::next() { | |||
496 | bool PlayListWidget::first() { | 496 | bool PlayListWidget::first() { |
497 | if ( mediaPlayerState->playlist() ) | 497 | if ( mediaPlayerState->isUsingPlaylist() ) |
498 | return d->selectedFiles->first(); | 498 | return d->selectedFiles->first(); |
499 | else | 499 | else |
500 | return mediaPlayerState->looping(); | 500 | return mediaPlayerState->isLooping(); |
501 | } | 501 | } |
@@ -504,6 +504,6 @@ bool PlayListWidget::first() { | |||
504 | bool PlayListWidget::last() { | 504 | bool PlayListWidget::last() { |
505 | if ( mediaPlayerState->playlist() ) | 505 | if ( mediaPlayerState->isUsingPlaylist() ) |
506 | return d->selectedFiles->last(); | 506 | return d->selectedFiles->last(); |
507 | else | 507 | else |
508 | return mediaPlayerState->looping(); | 508 | return mediaPlayerState->isLooping(); |
509 | } | 509 | } |
@@ -1091,3 +1091,3 @@ void PlayListWidget::pmViewActivated(int index) { | |||
1091 | mediaPlayerState->toggleFullscreen(); | 1091 | mediaPlayerState->toggleFullscreen(); |
1092 | bool b=mediaPlayerState->fullscreen(); | 1092 | bool b=mediaPlayerState->isFullscreen(); |
1093 | pmView->setItemChecked( index, b); | 1093 | pmView->setItemChecked( index, b); |
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp index 3a757f0..c435241 100644 --- a/noncore/multimedia/opieplayer2/videowidget.cpp +++ b/noncore/multimedia/opieplayer2/videowidget.cpp | |||
@@ -146,4 +146,4 @@ QWidget( parent, name, f ), scaledWidth( 0 ), scaledHeight( 0 ) { | |||
146 | setPosition( mediaPlayerState->position() ); | 146 | setPosition( mediaPlayerState->position() ); |
147 | setFullscreen( mediaPlayerState->fullscreen() ); | 147 | setFullscreen( mediaPlayerState->isFullscreen() ); |
148 | setPlaying( mediaPlayerState->playing() ); | 148 | setPlaying( mediaPlayerState->isPlaying() ); |
149 | } | 149 | } |
@@ -260,3 +260,3 @@ void VideoWidget::updateSlider( long i, long max ) { | |||
260 | int val = int((double)i * width / max); | 260 | int val = int((double)i * width / max); |
261 | if ( !mediaPlayerState->fullscreen() && !videoSliderBeingMoved ) { | 261 | if ( !mediaPlayerState->isFullscreen() && !videoSliderBeingMoved ) { |
262 | if ( slider->value() != val ) { | 262 | if ( slider->value() != val ) { |
@@ -329,3 +329,3 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
329 | case VideoPlay: { | 329 | case VideoPlay: { |
330 | if( mediaPlayerState->paused() ) { | 330 | if( mediaPlayerState->isPaused() ) { |
331 | setToggleButton( i, FALSE ); | 331 | setToggleButton( i, FALSE ); |
@@ -333,3 +333,3 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
333 | return; | 333 | return; |
334 | } else if( !mediaPlayerState->paused() ) { | 334 | } else if( !mediaPlayerState->isPaused() ) { |
335 | setToggleButton( i, TRUE ); | 335 | setToggleButton( i, TRUE ); |
@@ -359,3 +359,3 @@ void VideoWidget::mousePressEvent( QMouseEvent *event ) { | |||
359 | void VideoWidget::mouseReleaseEvent( QMouseEvent *event ) { | 359 | void VideoWidget::mouseReleaseEvent( QMouseEvent *event ) { |
360 | if ( mediaPlayerState->fullscreen() ) { | 360 | if ( mediaPlayerState->isFullscreen() ) { |
361 | mediaPlayerState->setFullscreen( FALSE ); | 361 | mediaPlayerState->setFullscreen( FALSE ); |
@@ -378,3 +378,3 @@ void VideoWidget::showEvent( QShowEvent* ) { | |||
378 | void VideoWidget::makeVisible() { | 378 | void VideoWidget::makeVisible() { |
379 | if ( mediaPlayerState->fullscreen() ) { | 379 | if ( mediaPlayerState->isFullscreen() ) { |
380 | setBackgroundMode( QWidget::NoBackground ); | 380 | setBackgroundMode( QWidget::NoBackground ); |
@@ -405,3 +405,3 @@ void VideoWidget::makeVisible() { | |||
405 | 405 | ||
406 | if ( !mediaPlayerState->seekable() ) { | 406 | if ( !mediaPlayerState->isSeekable() ) { |
407 | if( !slider->isHidden()) { | 407 | if( !slider->isHidden()) { |
@@ -429,3 +429,3 @@ void VideoWidget::paintEvent( QPaintEvent * pe) { | |||
429 | 429 | ||
430 | if ( mediaPlayerState->fullscreen() ) { | 430 | if ( mediaPlayerState->isFullscreen() ) { |
431 | // Clear the background | 431 | // Clear the background |
@@ -476,3 +476,3 @@ void VideoWidget::keyReleaseEvent( QKeyEvent *e) { | |||
476 | case Key_Space: { | 476 | case Key_Space: { |
477 | if(mediaPlayerState->playing()) { | 477 | if(mediaPlayerState->isPlaying()) { |
478 | mediaPlayerState->setPlaying(FALSE); | 478 | mediaPlayerState->setPlaying(FALSE); |
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.cpp b/noncore/multimedia/opieplayer2/xinecontrol.cpp index f6289d7..71e08a6 100644 --- a/noncore/multimedia/opieplayer2/xinecontrol.cpp +++ b/noncore/multimedia/opieplayer2/xinecontrol.cpp | |||
@@ -182,3 +182,3 @@ long XineControl::position() { | |||
182 | emit positionChanged( emitPos ); | 182 | emit positionChanged( emitPos ); |
183 | if( mediaPlayerState->playing() ) { | 183 | if( mediaPlayerState->isPlaying() ) { |
184 | // needs to be stopped the media is stopped | 184 | // needs to be stopped the media is stopped |