summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.cpp1
-rw-r--r--noncore/multimedia/opieplayer2/mediaplayer.cpp7
-rw-r--r--noncore/multimedia/opieplayer2/mediaplayerstate.cpp6
-rw-r--r--noncore/multimedia/opieplayer2/mediaplayerstate.h2
4 files changed, 10 insertions, 6 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
@@ -532,6 +532,7 @@ void AudioWidget::keyReleaseEvent( QKeyEvent *e)
case Key_F10: //contacts
break;
case Key_F11: //menu
+ mediaPlayerState->toggleBlank();
break;
case Key_F12: //home
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
@@ -29,6 +29,8 @@ extern PlayListWidget *playList;
extern MediaPlayerState *mediaPlayerState;
+#define FBIOBLANK 0x4611
+
MediaPlayer::MediaPlayer( QObject *parent, const char *name )
: QObject( parent, name ), volumeDirection( 0 ), currentFile( NULL ) {
@@ -252,8 +254,7 @@ void MediaPlayer::timerEvent( QTimerEvent * ) {
void MediaPlayer::blank( bool b ) {
fd=open("/dev/fb0",O_RDWR);
if (fd != -1) {
-
- if ( !b ) {
+ if ( b ) {
qDebug("do blanking");
ioctl( fd, FBIOBLANK, 3 );
isBlanked = TRUE;
@@ -263,6 +264,8 @@ void MediaPlayer::blank( bool b ) {
isBlanked = FALSE;
}
close( fd );
+ } else {
+ qDebug("<< /dev/fb0 could not be opend >>");
}
}
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
@@ -115,7 +115,7 @@ void MediaPlayerState::setIsStreaming( bool b ) {
}
-void MediaPlayerState::setBlank( bool b ) {
+void MediaPlayerState::setFullscreen( bool b ) {
if ( isFullscreen == b ) {
return;
}
@@ -124,7 +124,7 @@ void MediaPlayerState::setBlank( bool b ) {
}
-void MediaPlayerState::setFullscreen( bool b ) {
+void MediaPlayerState::setBlanked( bool b ) {
if ( isBlanked == b ) {
return;
}
@@ -274,7 +274,7 @@ void MediaPlayerState::togglePlaying() {
}
void MediaPlayerState::toggleBlank() {
- setBlank( !isBlanked);
+ setBlanked( !isBlanked);
}
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
@@ -78,7 +78,7 @@ public slots:
void updatePosition( long p );
void setLength( long l );
void setView( char v );
- void setBlank( bool b );
+ void setBlanked( bool b );
void setPrev();
void setNext();