author | harlekin <harlekin> | 2002-08-16 15:16:13 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-08-16 15:16:13 (UTC) |
commit | aa9eba407a8236c72822d24643b58d4d48ae80c0 (patch) (side-by-side diff) | |
tree | 178c91d1a1d33a3ae6ae7bf91746fc1a4fd499e2 /noncore/multimedia/opieplayer2 | |
parent | c150d03ae4d626c57531f89413710033d1ef5151 (diff) | |
download | opie-aa9eba407a8236c72822d24643b58d4d48ae80c0.zip opie-aa9eba407a8236c72822d24643b58d4d48ae80c0.tar.gz opie-aa9eba407a8236c72822d24643b58d4d48ae80c0.tar.bz2 |
blank now works, mail key on ipaq
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) break; case Key_F10: //contacts 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: { if(mediaPlayerState->playing()) { // 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; extern PlayListWidget *playList; extern MediaPlayerState *mediaPlayerState; +#define FBIOBLANK 0x4611 + MediaPlayer::MediaPlayer( QObject *parent, const char *name ) : QObject( parent, name ), volumeDirection( 0 ), currentFile( NULL ) { @@ -251,10 +253,9 @@ 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; } else { @@ -262,8 +263,10 @@ void MediaPlayer::blank( bool b ) { ioctl( fd, FBIOBLANK, 0); isBlanked = FALSE; } close( fd ); + } else { + qDebug("<< /dev/fb0 could not be opend >>"); } } void MediaPlayer::keyReleaseEvent( QKeyEvent *e) { @@ -282,10 +285,10 @@ void MediaPlayer::keyReleaseEvent( QKeyEvent *e) { // mediaPlayerState->toggleBlank(); break; case Key_F13: //mail qDebug("Blank here"); -// mediaPlayerState->toggleBlank(); - break; + // mediaPlayerState->toggleBlank(); + break; } } 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 ) { isStreaming = b; } -void MediaPlayerState::setBlank( bool b ) { +void MediaPlayerState::setFullscreen( bool b ) { if ( isFullscreen == b ) { return; } isFullscreen = b; emit fullscreenToggled(b); } -void MediaPlayerState::setFullscreen( bool b ) { +void MediaPlayerState::setBlanked( bool b ) { if ( isBlanked == b ) { return; } isBlanked = b; @@ -273,9 +273,9 @@ void MediaPlayerState::togglePlaying() { setPlaying( !isPlaying); } 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 @@ -77,9 +77,9 @@ public slots: void setPosition( long p ); void updatePosition( long p ); void setLength( long l ); void setView( char v ); - void setBlank( bool b ); + void setBlanked( bool b ); void setPrev(); void setNext(); void setList(); |