Diffstat (limited to 'noncore/multimedia/opieplayer2') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 3 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayer.cpp | 11 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayerstate.cpp | 6 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayerstate.h | 2 |
4 files changed, 13 insertions, 9 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp index 56203e0..604ed3a 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.cpp +++ b/noncore/multimedia/opieplayer2/audiowidget.cpp | |||
@@ -531,13 +531,14 @@ void AudioWidget::keyReleaseEvent( QKeyEvent *e) | |||
531 | break; | 531 | break; |
532 | case Key_F10: //contacts | 532 | case Key_F10: //contacts |
533 | break; | 533 | break; |
534 | case Key_F11: //menu | 534 | case Key_F11: //menu |
535 | mediaPlayerState->toggleBlank(); | ||
535 | break; | 536 | break; |
536 | case Key_F12: //home | 537 | case Key_F12: //home |
537 | break; | 538 | break; |
538 | case Key_F13: //mail | 539 | case Key_F13: //mail |
539 | mediaPlayerState->toggleBlank(); | 540 | mediaPlayerState->toggleBlank(); |
540 | break; | 541 | break; |
541 | case Key_Space: { | 542 | case Key_Space: { |
542 | if(mediaPlayerState->playing()) { | 543 | if(mediaPlayerState->playing()) { |
543 | // toggleButton(1); | 544 | // toggleButton(1); |
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp index 858b51f..87f4f0c 100644 --- a/noncore/multimedia/opieplayer2/mediaplayer.cpp +++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp | |||
@@ -28,8 +28,10 @@ extern VideoWidget *videoUI; | |||
28 | extern PlayListWidget *playList; | 28 | extern PlayListWidget *playList; |
29 | extern MediaPlayerState *mediaPlayerState; | 29 | extern MediaPlayerState *mediaPlayerState; |
30 | 30 | ||
31 | 31 | ||
32 | #define FBIOBLANK 0x4611 | ||
33 | |||
32 | MediaPlayer::MediaPlayer( QObject *parent, const char *name ) | 34 | MediaPlayer::MediaPlayer( QObject *parent, const char *name ) |
33 | : QObject( parent, name ), volumeDirection( 0 ), currentFile( NULL ) { | 35 | : QObject( parent, name ), volumeDirection( 0 ), currentFile( NULL ) { |
34 | 36 | ||
35 | 37 | ||
@@ -251,10 +253,9 @@ void MediaPlayer::timerEvent( QTimerEvent * ) { | |||
251 | 253 | ||
252 | void MediaPlayer::blank( bool b ) { | 254 | void MediaPlayer::blank( bool b ) { |
253 | fd=open("/dev/fb0",O_RDWR); | 255 | fd=open("/dev/fb0",O_RDWR); |
254 | if (fd != -1) { | 256 | if (fd != -1) { |
255 | 257 | if ( b ) { | |
256 | if ( !b ) { | ||
257 | qDebug("do blanking"); | 258 | qDebug("do blanking"); |
258 | ioctl( fd, FBIOBLANK, 3 ); | 259 | ioctl( fd, FBIOBLANK, 3 ); |
259 | isBlanked = TRUE; | 260 | isBlanked = TRUE; |
260 | } else { | 261 | } else { |
@@ -262,8 +263,10 @@ void MediaPlayer::blank( bool b ) { | |||
262 | ioctl( fd, FBIOBLANK, 0); | 263 | ioctl( fd, FBIOBLANK, 0); |
263 | isBlanked = FALSE; | 264 | isBlanked = FALSE; |
264 | } | 265 | } |
265 | close( fd ); | 266 | close( fd ); |
267 | } else { | ||
268 | qDebug("<< /dev/fb0 could not be opend >>"); | ||
266 | } | 269 | } |
267 | } | 270 | } |
268 | 271 | ||
269 | void MediaPlayer::keyReleaseEvent( QKeyEvent *e) { | 272 | void MediaPlayer::keyReleaseEvent( QKeyEvent *e) { |
@@ -282,10 +285,10 @@ void MediaPlayer::keyReleaseEvent( QKeyEvent *e) { | |||
282 | // mediaPlayerState->toggleBlank(); | 285 | // mediaPlayerState->toggleBlank(); |
283 | break; | 286 | break; |
284 | case Key_F13: //mail | 287 | case Key_F13: //mail |
285 | qDebug("Blank here"); | 288 | qDebug("Blank here"); |
286 | // mediaPlayerState->toggleBlank(); | 289 | // mediaPlayerState->toggleBlank(); |
287 | break; | 290 | break; |
288 | } | 291 | } |
289 | } | 292 | } |
290 | 293 | ||
291 | void MediaPlayer::cleanUp() { | 294 | void MediaPlayer::cleanUp() { |
diff --git a/noncore/multimedia/opieplayer2/mediaplayerstate.cpp b/noncore/multimedia/opieplayer2/mediaplayerstate.cpp index 6aafb88..6833e07 100644 --- a/noncore/multimedia/opieplayer2/mediaplayerstate.cpp +++ b/noncore/multimedia/opieplayer2/mediaplayerstate.cpp | |||
@@ -114,18 +114,18 @@ void MediaPlayerState::setIsStreaming( bool b ) { | |||
114 | isStreaming = b; | 114 | isStreaming = b; |
115 | } | 115 | } |
116 | 116 | ||
117 | 117 | ||
118 | void MediaPlayerState::setBlank( bool b ) { | 118 | void MediaPlayerState::setFullscreen( bool b ) { |
119 | if ( isFullscreen == b ) { | 119 | if ( isFullscreen == b ) { |
120 | return; | 120 | return; |
121 | } | 121 | } |
122 | isFullscreen = b; | 122 | isFullscreen = b; |
123 | emit fullscreenToggled(b); | 123 | emit fullscreenToggled(b); |
124 | } | 124 | } |
125 | 125 | ||
126 | 126 | ||
127 | void MediaPlayerState::setFullscreen( bool b ) { | 127 | void MediaPlayerState::setBlanked( bool b ) { |
128 | if ( isBlanked == b ) { | 128 | if ( isBlanked == b ) { |
129 | return; | 129 | return; |
130 | } | 130 | } |
131 | isBlanked = b; | 131 | isBlanked = b; |
@@ -273,9 +273,9 @@ void MediaPlayerState::togglePlaying() { | |||
273 | setPlaying( !isPlaying); | 273 | setPlaying( !isPlaying); |
274 | } | 274 | } |
275 | 275 | ||
276 | void MediaPlayerState::toggleBlank() { | 276 | void MediaPlayerState::toggleBlank() { |
277 | setBlank( !isBlanked); | 277 | setBlanked( !isBlanked); |
278 | } | 278 | } |
279 | 279 | ||
280 | 280 | ||
281 | 281 | ||
diff --git a/noncore/multimedia/opieplayer2/mediaplayerstate.h b/noncore/multimedia/opieplayer2/mediaplayerstate.h index 3baffd3..b3431d7 100644 --- a/noncore/multimedia/opieplayer2/mediaplayerstate.h +++ b/noncore/multimedia/opieplayer2/mediaplayerstate.h | |||
@@ -77,9 +77,9 @@ public slots: | |||
77 | void setPosition( long p ); | 77 | void setPosition( long p ); |
78 | void updatePosition( long p ); | 78 | void updatePosition( long p ); |
79 | void setLength( long l ); | 79 | void setLength( long l ); |
80 | void setView( char v ); | 80 | void setView( char v ); |
81 | void setBlank( bool b ); | 81 | void setBlanked( bool b ); |
82 | 82 | ||
83 | void setPrev(); | 83 | void setPrev(); |
84 | void setNext(); | 84 | void setNext(); |
85 | void setList(); | 85 | void setList(); |