summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.cpp3
-rw-r--r--noncore/multimedia/opieplayer2/mediaplayer.cpp11
-rw-r--r--noncore/multimedia/opieplayer2/mediaplayerstate.cpp6
-rw-r--r--noncore/multimedia/opieplayer2/mediaplayerstate.h2
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
@@ -534,2 +534,3 @@ void AudioWidget::keyReleaseEvent( QKeyEvent *e)
534 case Key_F11: //menu 534 case Key_F11: //menu
535 mediaPlayerState->toggleBlank();
535 break; 536 break;
@@ -538,3 +539,3 @@ void AudioWidget::keyReleaseEvent( QKeyEvent *e)
538 case Key_F13: //mail 539 case Key_F13: //mail
539 mediaPlayerState->toggleBlank(); 540 mediaPlayerState->toggleBlank();
540 break; 541 break;
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
@@ -31,2 +31,4 @@ extern MediaPlayerState *mediaPlayerState;
31 31
32#define FBIOBLANK 0x4611
33
32MediaPlayer::MediaPlayer( QObject *parent, const char *name ) 34MediaPlayer::MediaPlayer( QObject *parent, const char *name )
@@ -254,4 +256,3 @@ void MediaPlayer::blank( bool b ) {
254 if (fd != -1) { 256 if (fd != -1) {
255 257 if ( b ) {
256 if ( !b ) {
257 qDebug("do blanking"); 258 qDebug("do blanking");
@@ -265,2 +266,4 @@ void MediaPlayer::blank( bool b ) {
265 close( fd ); 266 close( fd );
267 } else {
268 qDebug("<< /dev/fb0 could not be opend >>");
266 } 269 }
@@ -285,4 +288,4 @@ void MediaPlayer::keyReleaseEvent( QKeyEvent *e) {
285 qDebug("Blank here"); 288 qDebug("Blank here");
286// mediaPlayerState->toggleBlank(); 289 // mediaPlayerState->toggleBlank();
287 break; 290 break;
288 } 291 }
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
@@ -117,3 +117,3 @@ void MediaPlayerState::setIsStreaming( bool b ) {
117 117
118void MediaPlayerState::setBlank( bool b ) { 118void MediaPlayerState::setFullscreen( bool b ) {
119 if ( isFullscreen == b ) { 119 if ( isFullscreen == b ) {
@@ -126,3 +126,3 @@ void MediaPlayerState::setBlank( bool b ) {
126 126
127void MediaPlayerState::setFullscreen( bool b ) { 127void MediaPlayerState::setBlanked( bool b ) {
128 if ( isBlanked == b ) { 128 if ( isBlanked == b ) {
@@ -276,3 +276,3 @@ void MediaPlayerState::togglePlaying() {
276void MediaPlayerState::toggleBlank() { 276void MediaPlayerState::toggleBlank() {
277 setBlank( !isBlanked); 277 setBlanked( !isBlanked);
278} 278}
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
@@ -80,3 +80,3 @@ public slots:
80 void setView( char v ); 80 void setView( char v );
81 void setBlank( bool b ); 81 void setBlanked( bool b );
82 82