summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-08-16 15:16:13 (UTC)
committer harlekin <harlekin>2002-08-16 15:16:13 (UTC)
commitaa9eba407a8236c72822d24643b58d4d48ae80c0 (patch) (side-by-side diff)
tree178c91d1a1d33a3ae6ae7bf91746fc1a4fd499e2
parentc150d03ae4d626c57531f89413710033d1ef5151 (diff)
downloadopie-aa9eba407a8236c72822d24643b58d4d48ae80c0.zip
opie-aa9eba407a8236c72822d24643b58d4d48ae80c0.tar.gz
opie-aa9eba407a8236c72822d24643b58d4d48ae80c0.tar.bz2
blank now works, mail key on ipaq
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
@@ -533,9 +533,10 @@ void AudioWidget::keyReleaseEvent( QKeyEvent *e)
break;
case Key_F11: //menu
+ mediaPlayerState->toggleBlank();
break;
case Key_F12: //home
break;
case Key_F13: //mail
- mediaPlayerState->toggleBlank();
+ mediaPlayerState->toggleBlank();
break;
case Key_Space: {
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
@@ -30,4 +30,6 @@ extern MediaPlayerState *mediaPlayerState;
+#define FBIOBLANK 0x4611
+
MediaPlayer::MediaPlayer( QObject *parent, const char *name )
: QObject( parent, name ), volumeDirection( 0 ), currentFile( NULL ) {
@@ -253,6 +255,5 @@ 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 );
@@ -264,4 +265,6 @@ void MediaPlayer::blank( bool b ) {
}
close( fd );
+ } else {
+ qDebug("<< /dev/fb0 could not be opend >>");
}
}
@@ -284,6 +287,6 @@ void MediaPlayer::keyReleaseEvent( QKeyEvent *e) {
case Key_F13: //mail
qDebug("Blank here");
-// mediaPlayerState->toggleBlank();
- break;
+ // mediaPlayerState->toggleBlank();
+ break;
}
}
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
@@ -116,5 +116,5 @@ void MediaPlayerState::setIsStreaming( bool b ) {
-void MediaPlayerState::setBlank( bool b ) {
+void MediaPlayerState::setFullscreen( bool b ) {
if ( isFullscreen == b ) {
return;
@@ -125,5 +125,5 @@ void MediaPlayerState::setBlank( bool b ) {
-void MediaPlayerState::setFullscreen( bool b ) {
+void MediaPlayerState::setBlanked( bool b ) {
if ( isBlanked == b ) {
return;
@@ -275,5 +275,5 @@ 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
@@ -79,5 +79,5 @@ public slots:
void setLength( long l );
void setView( char v );
- void setBlank( bool b );
+ void setBlanked( bool b );
void setPrev();