author | llornkcor <llornkcor> | 2002-04-21 22:23:53 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-04-21 22:23:53 (UTC) |
commit | 27522ce8deaa0bdc23a6b88002bc1d2e5f918ce6 (patch) (side-by-side diff) | |
tree | 05f6e301fd80c5551301ad88c19c3bcb061834ac | |
parent | 53a4a3f6398640d182a067a8ffef9b402cd35d7a (diff) | |
download | opie-27522ce8deaa0bdc23a6b88002bc1d2e5f918ce6.zip opie-27522ce8deaa0bdc23a6b88002bc1d2e5f918ce6.tar.gz opie-27522ce8deaa0bdc23a6b88002bc1d2e5f918ce6.tar.bz2 |
comment out grabKeyboard stuff till that function works properly
-rw-r--r-- | core/multimedia/opieplayer/mediaplayer.cpp | 38 | ||||
-rw-r--r-- | core/multimedia/opieplayer/mediaplayer.h | 6 | ||||
-rw-r--r-- | core/multimedia/opieplayer/playlistwidget.cpp | 51 | ||||
-rw-r--r-- | core/multimedia/opieplayer/playlistwidget.h | 4 | ||||
-rw-r--r-- | core/multimedia/opieplayer/videowidget.cpp | 2 |
5 files changed, 90 insertions, 11 deletions
diff --git a/core/multimedia/opieplayer/mediaplayer.cpp b/core/multimedia/opieplayer/mediaplayer.cpp index ab46a7d..b9e438b 100644 --- a/core/multimedia/opieplayer/mediaplayer.cpp +++ b/core/multimedia/opieplayer/mediaplayer.cpp @@ -44,9 +44,11 @@ extern MediaPlayerState *mediaPlayerState; MediaPlayer::MediaPlayer( QObject *parent, const char *name ) : QObject( parent, name ), volumeDirection( 0 ), currentFile( NULL ) { - QPEApplication::grabKeyboard(); + +// QPEApplication::grabKeyboard(); + connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( setPlaying( bool ) ) ); connect( mediaPlayerState, SIGNAL( pausedToggled( bool ) ), this, SLOT( pauseCheck( bool ) ) ); connect( mediaPlayerState, SIGNAL( next() ), this, SLOT( next() ) ); @@ -59,10 +61,8 @@ MediaPlayer::MediaPlayer( QObject *parent, const char *name ) } MediaPlayer::~MediaPlayer() { - QPEApplication::grabKeyboard(); - QPEApplication::ungrabKeyboard(); } void MediaPlayer::pauseCheck( bool b ) { @@ -184,4 +184,36 @@ void MediaPlayer::timerEvent( QTimerEvent * ) { else if ( volumeDirection == -1 ) AudioDevice::decreaseVolume(); } +void MediaPlayer::keyReleaseEvent( QKeyEvent *e) { + switch ( e->key() ) { +////////////////////////////// Zaurus keys + case Key_Home: + break; + case Key_F9: //activity + break; + case Key_F10: //contacts + break; + case Key_F11: //menu + break; + case Key_F12: //home + qDebug("Blank here"); + break; + case Key_F13: //mail + break; + } +} + +void MediaPlayer::doBlank() { + +} + +void MediaPlayer::doUnblank() { + +} + +void MediaPlayer::cleanUp() { +// QPEApplication::grabKeyboard(); +// QPEApplication::ungrabKeyboard(); + +} diff --git a/core/multimedia/opieplayer/mediaplayer.h b/core/multimedia/opieplayer/mediaplayer.h index 0354d21..cf9daea 100644 --- a/core/multimedia/opieplayer/mediaplayer.h +++ b/core/multimedia/opieplayer/mediaplayer.h @@ -46,10 +46,12 @@ private slots: void stopChangingVolume(); protected: void timerEvent( QTimerEvent *e ); -// void keyReleaseEvent( QKeyEvent *e); - + void keyReleaseEvent( QKeyEvent *e); + void doBlank(); + void doUnblank(); + void cleanUp(); private: int volumeDirection; const DocLnk *currentFile; }; diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp index faa6e3f..70b7cef 100644 --- a/core/multimedia/opieplayer/playlistwidget.cpp +++ b/core/multimedia/opieplayer/playlistwidget.cpp @@ -18,8 +18,9 @@ ** **********************************************************************/ // code added by L. J. Potter Sat 03-02-2002 06:17:54 #define QTOPIA_INTERNAL_FSLP +#include <qpe/qcopenvelope_qws.h> #include <qpe/qpemenubar.h> #include <qpe/qpetoolbar.h> #include <qpe/fileselector.h> @@ -61,8 +62,19 @@ #include <stdlib.h> #include "audiowidget.h" #include "videowidget.h" +#include <unistd.h> +#include <sys/file.h> +#include <sys/ioctl.h> +#include <sys/soundcard.h> + +// for setBacklight() +#include <linux/fb.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <stdlib.h> + #define BUTTONS_ON_TOOLBAR #define SIDE_BUTTONS #define CAN_SAVE_LOAD_PLAYLISTS @@ -1052,15 +1064,44 @@ void PlayListWidget::keyReleaseEvent( QKeyEvent *e) { switch ( e->key() ) { ////////////////////////////// Zaurus keys case Key_F9: //activity - if(audioUI->isHidden()) - audioUI->showMaximized(); +// if(audioUI->isHidden()) +// audioUI->showMaximized(); break; case Key_F10: //contacts - if( videoUI->isHidden()) - videoUI->showMaximized(); - +// if( videoUI->isHidden()) +// videoUI->showMaximized(); + break; + case Key_F11: //menu + break; + case Key_F12: //home +// doBlank(); + break; + case Key_F13: //mail +// doUnblank(); break; } } + +void PlayListWidget::doBlank() { + qDebug("do blanking"); + fd=open("/dev/fb0",O_RDWR); + if (fd != -1) { + ioctl(fd,FBIOBLANK,1); +// close(fd); + } +} + +void PlayListWidget::doUnblank() { + // this crashes opieplayer with a segfault +// int fd; +// fd=open("/dev/fb0",O_RDWR); + qDebug("do unblanking"); + if (fd != -1) { + ioctl(fd,FBIOBLANK,0); + close(fd); + } + QCopEnvelope h("QPE/System", "setBacklight(int)"); + h <<-3;// v[1]; // -3 Force on +} diff --git a/core/multimedia/opieplayer/playlistwidget.h b/core/multimedia/opieplayer/playlistwidget.h index 16b9905..f22770f 100644 --- a/core/multimedia/opieplayer/playlistwidget.h +++ b/core/multimedia/opieplayer/playlistwidget.h @@ -56,8 +56,9 @@ public: void useSelectedDocument(); /* QTimer * menuTimer; */ FileSelector* playLists; QPushButton *tbDeletePlaylist; + int fd; public slots: bool first(); bool last(); bool next(); @@ -68,8 +69,11 @@ protected: /* void contentsMousePressEvent( QMouseEvent * e ); */ /* void contentsMouseReleaseEvent( QMouseEvent * e ); */ void keyReleaseEvent( QKeyEvent *e); private: + void doBlank(); + void doUnblank(); + void initializeStates(); void readConfig( Config& cfg ); void writeConfig( Config& cfg ) const; PlayListWidgetPrivate *d; // Private implementation data diff --git a/core/multimedia/opieplayer/videowidget.cpp b/core/multimedia/opieplayer/videowidget.cpp index d0cb764..3bce996 100644 --- a/core/multimedia/opieplayer/videowidget.cpp +++ b/core/multimedia/opieplayer/videowidget.cpp @@ -431,9 +431,9 @@ void VideoWidget::keyReleaseEvent( QKeyEvent *e) break; case Key_F9: //activity break; case Key_F10: //contacts - hide(); +// hide(); break; case Key_F11: //menu break; case Key_F12: //home |