summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-04-21 22:23:53 (UTC)
committer llornkcor <llornkcor>2002-04-21 22:23:53 (UTC)
commit27522ce8deaa0bdc23a6b88002bc1d2e5f918ce6 (patch) (unidiff)
tree05f6e301fd80c5551301ad88c19c3bcb061834ac
parent53a4a3f6398640d182a067a8ffef9b402cd35d7a (diff)
downloadopie-27522ce8deaa0bdc23a6b88002bc1d2e5f918ce6.zip
opie-27522ce8deaa0bdc23a6b88002bc1d2e5f918ce6.tar.gz
opie-27522ce8deaa0bdc23a6b88002bc1d2e5f918ce6.tar.bz2
comment out grabKeyboard stuff till that function works properly
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/multimedia/opieplayer/mediaplayer.cpp38
-rw-r--r--core/multimedia/opieplayer/mediaplayer.h6
-rw-r--r--core/multimedia/opieplayer/playlistwidget.cpp51
-rw-r--r--core/multimedia/opieplayer/playlistwidget.h4
-rw-r--r--core/multimedia/opieplayer/videowidget.cpp2
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
@@ -36,41 +36,41 @@
36 36
37#include "mediaplayerstate.h" 37#include "mediaplayerstate.h"
38 38
39 39
40extern AudioWidget *audioUI; 40extern AudioWidget *audioUI;
41extern PlayListWidget *playList; 41extern PlayListWidget *playList;
42extern LoopControl *loopControl; 42extern LoopControl *loopControl;
43extern MediaPlayerState *mediaPlayerState; 43extern MediaPlayerState *mediaPlayerState;
44 44
45 45
46MediaPlayer::MediaPlayer( QObject *parent, const char *name ) 46MediaPlayer::MediaPlayer( QObject *parent, const char *name )
47 : QObject( parent, name ), volumeDirection( 0 ), currentFile( NULL ) { 47 : QObject( parent, name ), volumeDirection( 0 ), currentFile( NULL ) {
48 QPEApplication::grabKeyboard(); 48
49// QPEApplication::grabKeyboard();
50 connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
49 51
50 connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( setPlaying( bool ) ) ); 52 connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( setPlaying( bool ) ) );
51 connect( mediaPlayerState, SIGNAL( pausedToggled( bool ) ), this, SLOT( pauseCheck( bool ) ) ); 53 connect( mediaPlayerState, SIGNAL( pausedToggled( bool ) ), this, SLOT( pauseCheck( bool ) ) );
52 connect( mediaPlayerState, SIGNAL( next() ), this, SLOT( next() ) ); 54 connect( mediaPlayerState, SIGNAL( next() ), this, SLOT( next() ) );
53 connect( mediaPlayerState, SIGNAL( prev() ), this, SLOT( prev() ) ); 55 connect( mediaPlayerState, SIGNAL( prev() ), this, SLOT( prev() ) );
54 56
55 connect( audioUI, SIGNAL( moreClicked() ), this, SLOT( startIncreasingVolume() ) ); 57 connect( audioUI, SIGNAL( moreClicked() ), this, SLOT( startIncreasingVolume() ) );
56 connect( audioUI, SIGNAL( lessClicked() ), this, SLOT( startDecreasingVolume() ) ); 58 connect( audioUI, SIGNAL( lessClicked() ), this, SLOT( startDecreasingVolume() ) );
57 connect( audioUI, SIGNAL( moreReleased() ), this, SLOT( stopChangingVolume() ) ); 59 connect( audioUI, SIGNAL( moreReleased() ), this, SLOT( stopChangingVolume() ) );
58 connect( audioUI, SIGNAL( lessReleased() ), this, SLOT( stopChangingVolume() ) ); 60 connect( audioUI, SIGNAL( lessReleased() ), this, SLOT( stopChangingVolume() ) );
59} 61}
60 62
61 63
62MediaPlayer::~MediaPlayer() { 64MediaPlayer::~MediaPlayer() {
63 QPEApplication::grabKeyboard();
64 QPEApplication::ungrabKeyboard();
65} 65}
66 66
67 67
68void MediaPlayer::pauseCheck( bool b ) { 68void MediaPlayer::pauseCheck( bool b ) {
69 // Only pause if playing 69 // Only pause if playing
70 if ( b && !mediaPlayerState->playing() ) 70 if ( b && !mediaPlayerState->playing() )
71 mediaPlayerState->setPaused( FALSE ); 71 mediaPlayerState->setPaused( FALSE );
72} 72}
73 73
74 74
75void MediaPlayer::play() { 75void MediaPlayer::play() {
76 mediaPlayerState->setPlaying( FALSE ); 76 mediaPlayerState->setPlaying( FALSE );
@@ -176,12 +176,44 @@ void MediaPlayer::startIncreasingVolume() {
176void MediaPlayer::stopChangingVolume() { 176void MediaPlayer::stopChangingVolume() {
177 killTimers(); 177 killTimers();
178} 178}
179 179
180 180
181void MediaPlayer::timerEvent( QTimerEvent * ) { 181void MediaPlayer::timerEvent( QTimerEvent * ) {
182 if ( volumeDirection == +1 ) 182 if ( volumeDirection == +1 )
183 AudioDevice::increaseVolume(); 183 AudioDevice::increaseVolume();
184 else if ( volumeDirection == -1 ) 184 else if ( volumeDirection == -1 )
185 AudioDevice::decreaseVolume(); 185 AudioDevice::decreaseVolume();
186} 186}
187 187
188void MediaPlayer::keyReleaseEvent( QKeyEvent *e) {
189 switch ( e->key() ) {
190////////////////////////////// Zaurus keys
191 case Key_Home:
192 break;
193 case Key_F9: //activity
194 break;
195 case Key_F10: //contacts
196 break;
197 case Key_F11: //menu
198 break;
199 case Key_F12: //home
200 qDebug("Blank here");
201 break;
202 case Key_F13: //mail
203 break;
204 }
205}
206
207void MediaPlayer::doBlank() {
208
209}
210
211void MediaPlayer::doUnblank() {
212
213}
214
215void MediaPlayer::cleanUp() {
216// QPEApplication::grabKeyboard();
217// QPEApplication::ungrabKeyboard();
218
219}
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
@@ -38,22 +38,24 @@ public:
38private slots: 38private slots:
39 void setPlaying( bool ); 39 void setPlaying( bool );
40 void pauseCheck( bool ); 40 void pauseCheck( bool );
41 void play(); 41 void play();
42 void next(); 42 void next();
43 void prev(); 43 void prev();
44 void startIncreasingVolume(); 44 void startIncreasingVolume();
45 void startDecreasingVolume(); 45 void startDecreasingVolume();
46 void stopChangingVolume(); 46 void stopChangingVolume();
47 47
48protected: 48protected:
49 void timerEvent( QTimerEvent *e ); 49 void timerEvent( QTimerEvent *e );
50// void keyReleaseEvent( QKeyEvent *e); 50 void keyReleaseEvent( QKeyEvent *e);
51 51 void doBlank();
52 void doUnblank();
53 void cleanUp();
52private: 54private:
53 int volumeDirection; 55 int volumeDirection;
54 const DocLnk *currentFile; 56 const DocLnk *currentFile;
55}; 57};
56 58
57 59
58#endif // MEDIA_PLAYER_H 60#endif // MEDIA_PLAYER_H
59 61
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
@@ -10,24 +10,25 @@
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14** See http://www.trolltech.com/gpl/ for GPL licensing information. 14** See http://www.trolltech.com/gpl/ for GPL licensing information.
15** 15**
16** Contact info@trolltech.com if any conditions of this licensing are 16** Contact info@trolltech.com if any conditions of this licensing are
17** not clear to you. 17** not clear to you.
18** 18**
19**********************************************************************/ 19**********************************************************************/
20// code added by L. J. Potter Sat 03-02-2002 06:17:54 20// code added by L. J. Potter Sat 03-02-2002 06:17:54
21#define QTOPIA_INTERNAL_FSLP 21#define QTOPIA_INTERNAL_FSLP
22#include <qpe/qcopenvelope_qws.h>
22 23
23#include <qpe/qpemenubar.h> 24#include <qpe/qpemenubar.h>
24#include <qpe/qpetoolbar.h> 25#include <qpe/qpetoolbar.h>
25#include <qpe/fileselector.h> 26#include <qpe/fileselector.h>
26#include <qpe/qpeapplication.h> 27#include <qpe/qpeapplication.h>
27#include <qpe/lnkproperties.h> 28#include <qpe/lnkproperties.h>
28#include <qpe/storage.h> 29#include <qpe/storage.h>
29 30
30#include <qpe/applnk.h> 31#include <qpe/applnk.h>
31#include <qpe/config.h> 32#include <qpe/config.h>
32#include <qpe/global.h> 33#include <qpe/global.h>
33#include <qpe/resource.h> 34#include <qpe/resource.h>
@@ -53,24 +54,35 @@
53//#include <qtimer.h> 54//#include <qtimer.h>
54 55
55#include "playlistselection.h" 56#include "playlistselection.h"
56#include "playlistwidget.h" 57#include "playlistwidget.h"
57#include "mediaplayerstate.h" 58#include "mediaplayerstate.h"
58 59
59#include "inputDialog.h" 60#include "inputDialog.h"
60 61
61#include <stdlib.h> 62#include <stdlib.h>
62#include "audiowidget.h" 63#include "audiowidget.h"
63#include "videowidget.h" 64#include "videowidget.h"
64 65
66#include <unistd.h>
67#include <sys/file.h>
68#include <sys/ioctl.h>
69#include <sys/soundcard.h>
70
71// for setBacklight()
72#include <linux/fb.h>
73#include <sys/types.h>
74#include <sys/stat.h>
75#include <stdlib.h>
76
65#define BUTTONS_ON_TOOLBAR 77#define BUTTONS_ON_TOOLBAR
66#define SIDE_BUTTONS 78#define SIDE_BUTTONS
67#define CAN_SAVE_LOAD_PLAYLISTS 79#define CAN_SAVE_LOAD_PLAYLISTS
68 80
69extern AudioWidget *audioUI; 81extern AudioWidget *audioUI;
70extern VideoWidget *videoUI; 82extern VideoWidget *videoUI;
71extern MediaPlayerState *mediaPlayerState; 83extern MediaPlayerState *mediaPlayerState;
72 84
73// class myFileSelector { 85// class myFileSelector {
74 86
75// }; 87// };
76class PlayListWidgetPrivate { 88class PlayListWidgetPrivate {
@@ -1044,23 +1056,52 @@ void PlayListWidget::openFile() {
1044// delete fileDlg2; 1056// delete fileDlg2;
1045 } 1057 }
1046 1058
1047 if(fileDlg) 1059 if(fileDlg)
1048 delete fileDlg; 1060 delete fileDlg;
1049} 1061}
1050 1062
1051void PlayListWidget::keyReleaseEvent( QKeyEvent *e) 1063void PlayListWidget::keyReleaseEvent( QKeyEvent *e)
1052{ 1064{
1053 switch ( e->key() ) { 1065 switch ( e->key() ) {
1054////////////////////////////// Zaurus keys 1066////////////////////////////// Zaurus keys
1055 case Key_F9: //activity 1067 case Key_F9: //activity
1056 if(audioUI->isHidden()) 1068// if(audioUI->isHidden())
1057 audioUI->showMaximized(); 1069// audioUI->showMaximized();
1058 break; 1070 break;
1059 case Key_F10: //contacts 1071 case Key_F10: //contacts
1060 if( videoUI->isHidden()) 1072// if( videoUI->isHidden())
1061 videoUI->showMaximized(); 1073// videoUI->showMaximized();
1062 1074 break;
1075 case Key_F11: //menu
1076 break;
1077 case Key_F12: //home
1078// doBlank();
1079 break;
1080 case Key_F13: //mail
1081// doUnblank();
1063 break; 1082 break;
1064 1083
1065 } 1084 }
1066} 1085}
1086
1087void PlayListWidget::doBlank() {
1088 qDebug("do blanking");
1089 fd=open("/dev/fb0",O_RDWR);
1090 if (fd != -1) {
1091 ioctl(fd,FBIOBLANK,1);
1092// close(fd);
1093 }
1094}
1095
1096void PlayListWidget::doUnblank() {
1097 // this crashes opieplayer with a segfault
1098// int fd;
1099// fd=open("/dev/fb0",O_RDWR);
1100 qDebug("do unblanking");
1101 if (fd != -1) {
1102 ioctl(fd,FBIOBLANK,0);
1103 close(fd);
1104 }
1105 QCopEnvelope h("QPE/System", "setBacklight(int)");
1106 h <<-3;// v[1]; // -3 Force on
1107}
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
@@ -48,36 +48,40 @@ public:
48 DocLnkSet vFiles; 48 DocLnkSet vFiles;
49 QListView *audioView, *videoView, *playlistView; 49 QListView *audioView, *videoView, *playlistView;
50 QLabel *libString; 50 QLabel *libString;
51 bool fromSetDocument; 51 bool fromSetDocument;
52 bool insanityBool; 52 bool insanityBool;
53 QString setDocFileRef; 53 QString setDocFileRef;
54 // retrieve the current playlist entry (media file link) 54 // retrieve the current playlist entry (media file link)
55 const DocLnk *current(); 55 const DocLnk *current();
56 void useSelectedDocument(); 56 void useSelectedDocument();
57/* QTimer * menuTimer; */ 57/* QTimer * menuTimer; */
58 FileSelector* playLists; 58 FileSelector* playLists;
59 QPushButton *tbDeletePlaylist; 59 QPushButton *tbDeletePlaylist;
60 int fd;
60public slots: 61public slots:
61 bool first(); 62 bool first();
62 bool last(); 63 bool last();
63 bool next(); 64 bool next();
64 bool prev(); 65 bool prev();
65/* void setFullScreen(); */ 66/* void setFullScreen(); */
66/* void setScaled(); */ 67/* void setScaled(); */
67protected: 68protected:
68/* void contentsMousePressEvent( QMouseEvent * e ); */ 69/* void contentsMousePressEvent( QMouseEvent * e ); */
69/* void contentsMouseReleaseEvent( QMouseEvent * e ); */ 70/* void contentsMouseReleaseEvent( QMouseEvent * e ); */
70void keyReleaseEvent( QKeyEvent *e); 71void keyReleaseEvent( QKeyEvent *e);
71private: 72private:
73 void doBlank();
74 void doUnblank();
75
72 void initializeStates(); 76 void initializeStates();
73 void readConfig( Config& cfg ); 77 void readConfig( Config& cfg );
74 void writeConfig( Config& cfg ) const; 78 void writeConfig( Config& cfg ) const;
75 PlayListWidgetPrivate *d; // Private implementation data 79 PlayListWidgetPrivate *d; // Private implementation data
76 void populateAudioView(); 80 void populateAudioView();
77 void populateVideoView(); 81 void populateVideoView();
78private slots: 82private slots:
79 void openFile(); 83 void openFile();
80 void setDocument( const QString& fileref ); 84 void setDocument( const QString& fileref );
81 void addToSelection( const DocLnk& ); // Add a media file to the playlist 85 void addToSelection( const DocLnk& ); // Add a media file to the playlist
82 void addToSelection( QListViewItem* ); // Add a media file to the playlist 86 void addToSelection( QListViewItem* ); // Add a media file to the playlist
83 void setActiveWindow(); // need to handle this to show the right view 87 void setActiveWindow(); // need to handle this to show the right view
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
@@ -423,25 +423,25 @@ bool VideoWidget::playVideo() {
423 423
424 424
425 425
426void VideoWidget::keyReleaseEvent( QKeyEvent *e) 426void VideoWidget::keyReleaseEvent( QKeyEvent *e)
427{ 427{
428 switch ( e->key() ) { 428 switch ( e->key() ) {
429////////////////////////////// Zaurus keys 429////////////////////////////// Zaurus keys
430 case Key_Home: 430 case Key_Home:
431 break; 431 break;
432 case Key_F9: //activity 432 case Key_F9: //activity
433 break; 433 break;
434 case Key_F10: //contacts 434 case Key_F10: //contacts
435 hide(); 435// hide();
436 break; 436 break;
437 case Key_F11: //menu 437 case Key_F11: //menu
438 break; 438 break;
439 case Key_F12: //home 439 case Key_F12: //home
440 break; 440 break;
441 case Key_F13: //mail 441 case Key_F13: //mail
442 break; 442 break;
443 case Key_Space: { 443 case Key_Space: {
444 if(mediaPlayerState->playing()) { 444 if(mediaPlayerState->playing()) {
445 mediaPlayerState->setPlaying(FALSE); 445 mediaPlayerState->setPlaying(FALSE);
446 } else { 446 } else {
447 mediaPlayerState->setPlaying(TRUE); 447 mediaPlayerState->setPlaying(TRUE);