-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayer.cpp | 8 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidget.cpp | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp index 0f8242b..6a48b82 100644 --- a/noncore/multimedia/opieplayer2/mediaplayer.cpp +++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp | |||
@@ -25,48 +25,51 @@ | |||
25 | 25 | ||
26 | extern AudioWidget *audioUI; | 26 | extern AudioWidget *audioUI; |
27 | extern VideoWidget *videoUI; | 27 | extern VideoWidget *videoUI; |
28 | extern PlayListWidget *playList; | 28 | extern PlayListWidget *playList; |
29 | extern MediaPlayerState *mediaPlayerState; | 29 | extern MediaPlayerState *mediaPlayerState; |
30 | 30 | ||
31 | 31 | ||
32 | #define FBIOBLANK 0x4611 | 32 | #define FBIOBLANK 0x4611 |
33 | 33 | ||
34 | MediaPlayer::MediaPlayer( QObject *parent, const char *name ) | 34 | MediaPlayer::MediaPlayer( QObject *parent, const char *name ) |
35 | : QObject( parent, name ), volumeDirection( 0 ), currentFile( NULL ) { | 35 | : QObject( parent, name ), volumeDirection( 0 ), currentFile( NULL ) { |
36 | 36 | ||
37 | playList->setCaption(tr("OpiePlayer: Initializating")); | ||
38 | |||
37 | qApp->processEvents(); | 39 | qApp->processEvents(); |
38 | // QPEApplication::grabKeyboard(); // EVIL | 40 | // QPEApplication::grabKeyboard(); // EVIL |
39 | connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); | 41 | connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); |
40 | 42 | ||
41 | connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( setPlaying( bool ) ) ); | 43 | connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( setPlaying( bool ) ) ); |
42 | 44 | ||
43 | connect( mediaPlayerState, SIGNAL( pausedToggled( bool ) ), this, SLOT( pauseCheck( bool ) ) ); | 45 | connect( mediaPlayerState, SIGNAL( pausedToggled( bool ) ), this, SLOT( pauseCheck( bool ) ) ); |
44 | 46 | ||
45 | connect( mediaPlayerState, SIGNAL( next() ), this, SLOT( next() ) ); | 47 | connect( mediaPlayerState, SIGNAL( next() ), this, SLOT( next() ) ); |
46 | connect( mediaPlayerState, SIGNAL( prev() ), this, SLOT( prev() ) ); | 48 | connect( mediaPlayerState, SIGNAL( prev() ), this, SLOT( prev() ) ); |
47 | connect( mediaPlayerState, SIGNAL( blankToggled( bool ) ), this, SLOT ( blank( bool ) ) ); | 49 | connect( mediaPlayerState, SIGNAL( blankToggled( bool ) ), this, SLOT ( blank( bool ) ) ); |
48 | 50 | ||
49 | connect( audioUI, SIGNAL( moreClicked() ), this, SLOT( startIncreasingVolume() ) ); | 51 | connect( audioUI, SIGNAL( moreClicked() ), this, SLOT( startIncreasingVolume() ) ); |
50 | connect( audioUI, SIGNAL( lessClicked() ), this, SLOT( startDecreasingVolume() ) ); | 52 | connect( audioUI, SIGNAL( lessClicked() ), this, SLOT( startDecreasingVolume() ) ); |
51 | connect( audioUI, SIGNAL( moreReleased() ), this, SLOT( stopChangingVolume() ) ); | 53 | connect( audioUI, SIGNAL( moreReleased() ), this, SLOT( stopChangingVolume() ) ); |
52 | connect( audioUI, SIGNAL( lessReleased() ), this, SLOT( stopChangingVolume() ) ); | 54 | connect( audioUI, SIGNAL( lessReleased() ), this, SLOT( stopChangingVolume() ) ); |
53 | 55 | ||
54 | connect( videoUI, SIGNAL( moreClicked() ), this, SLOT( startIncreasingVolume() ) ); | 56 | connect( videoUI, SIGNAL( moreClicked() ), this, SLOT( startIncreasingVolume() ) ); |
55 | connect( videoUI, SIGNAL( lessClicked() ), this, SLOT( startDecreasingVolume() ) ); | 57 | connect( videoUI, SIGNAL( lessClicked() ), this, SLOT( startDecreasingVolume() ) ); |
56 | connect( videoUI, SIGNAL( moreReleased() ), this, SLOT( stopChangingVolume() ) ); | 58 | connect( videoUI, SIGNAL( moreReleased() ), this, SLOT( stopChangingVolume() ) ); |
57 | connect( videoUI, SIGNAL( lessReleased() ), this, SLOT( stopChangingVolume() ) ); | 59 | connect( videoUI, SIGNAL( lessReleased() ), this, SLOT( stopChangingVolume() ) ); |
58 | 60 | ||
59 | volControl = new VolumeControl; | 61 | volControl = new VolumeControl; |
60 | xineControl = new XineControl(); | 62 | xineControl = new XineControl(); |
63 | playList->setCaption(tr("OpiePlayer")); | ||
61 | } | 64 | } |
62 | 65 | ||
63 | MediaPlayer::~MediaPlayer() { | 66 | MediaPlayer::~MediaPlayer() { |
64 | delete xineControl; | 67 | delete xineControl; |
65 | delete volControl; | 68 | delete volControl; |
66 | } | 69 | } |
67 | 70 | ||
68 | void MediaPlayer::pauseCheck( bool b ) { | 71 | void MediaPlayer::pauseCheck( bool b ) { |
69 | if ( b && !mediaPlayerState->playing() ) { | 72 | if ( b && !mediaPlayerState->playing() ) { |
70 | mediaPlayerState->setPaused( FALSE ); | 73 | mediaPlayerState->setPaused( FALSE ); |
71 | } | 74 | } |
72 | } | 75 | } |
@@ -254,25 +257,25 @@ void MediaPlayer::blank( bool b ) { | |||
254 | if (fd != -1) { | 257 | if (fd != -1) { |
255 | if ( b ) { | 258 | if ( b ) { |
256 | qDebug("do blanking"); | 259 | qDebug("do blanking"); |
257 | ioctl( fd, FBIOBLANK, 3 ); | 260 | ioctl( fd, FBIOBLANK, 3 ); |
258 | isBlanked = TRUE; | 261 | isBlanked = TRUE; |
259 | } else { | 262 | } else { |
260 | qDebug("do unblanking"); | 263 | qDebug("do unblanking"); |
261 | ioctl( fd, FBIOBLANK, 0); | 264 | ioctl( fd, FBIOBLANK, 0); |
262 | isBlanked = FALSE; | 265 | isBlanked = FALSE; |
263 | } | 266 | } |
264 | close( fd ); | 267 | close( fd ); |
265 | } else { | 268 | } else { |
266 | qDebug("<< /dev/fb0 could not be opend >>"); | 269 | qDebug("<< /dev/fb0 could not be opened >>"); |
267 | } | 270 | } |
268 | } | 271 | } |
269 | 272 | ||
270 | void MediaPlayer::keyReleaseEvent( QKeyEvent *e) { | 273 | void MediaPlayer::keyReleaseEvent( QKeyEvent *e) { |
271 | switch ( e->key() ) { | 274 | switch ( e->key() ) { |
272 | ////////////////////////////// Zaurus keys | 275 | ////////////////////////////// Zaurus keys |
273 | case Key_Home: | 276 | case Key_Home: |
274 | break; | 277 | break; |
275 | case Key_F9: //activity | 278 | case Key_F9: //activity |
276 | break; | 279 | break; |
277 | case Key_F10: //contacts | 280 | case Key_F10: //contacts |
278 | break; | 281 | break; |
@@ -280,16 +283,17 @@ void MediaPlayer::keyReleaseEvent( QKeyEvent *e) { | |||
280 | break; | 283 | break; |
281 | case Key_F12: //home | 284 | case Key_F12: //home |
282 | qDebug("Blank here"); | 285 | qDebug("Blank here"); |
283 | // mediaPlayerState->toggleBlank(); | 286 | // mediaPlayerState->toggleBlank(); |
284 | break; | 287 | break; |
285 | case Key_F13: //mail | 288 | case Key_F13: //mail |
286 | qDebug("Blank here"); | 289 | qDebug("Blank here"); |
287 | // mediaPlayerState->toggleBlank(); | 290 | // mediaPlayerState->toggleBlank(); |
288 | break; | 291 | break; |
289 | } | 292 | } |
290 | } | 293 | } |
291 | 294 | ||
292 | void MediaPlayer::cleanUp() { | 295 | void MediaPlayer::cleanUp() {// this happens on closing |
296 | |||
293 | // QPEApplication::grabKeyboard(); | 297 | // QPEApplication::grabKeyboard(); |
294 | // QPEApplication::ungrabKeyboard(); | 298 | // QPEApplication::ungrabKeyboard(); |
295 | } | 299 | } |
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp index 251c2e5..5c804f5 100644 --- a/noncore/multimedia/opieplayer2/playlistwidget.cpp +++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp | |||
@@ -90,25 +90,25 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) | |||
90 | : QMainWindow( parent, name, fl ) { | 90 | : QMainWindow( parent, name, fl ) { |
91 | 91 | ||
92 | d = new PlayListWidgetPrivate; | 92 | d = new PlayListWidgetPrivate; |
93 | d->setDocumentUsed = FALSE; | 93 | d->setDocumentUsed = FALSE; |
94 | d->current = NULL; | 94 | d->current = NULL; |
95 | fromSetDocument = FALSE; | 95 | fromSetDocument = FALSE; |
96 | insanityBool=FALSE; | 96 | insanityBool=FALSE; |
97 | audioScan = FALSE; | 97 | audioScan = FALSE; |
98 | videoScan = FALSE; | 98 | videoScan = FALSE; |
99 | 99 | ||
100 | setBackgroundMode( PaletteButton ); | 100 | setBackgroundMode( PaletteButton ); |
101 | 101 | ||
102 | setCaption( tr("OpiePlayer") ); | 102 | // setCaption( tr("OpiePlayer") ); |
103 | setIcon( Resource::loadPixmap( "opieplayer2/MPEGPlayer" ) ); | 103 | setIcon( Resource::loadPixmap( "opieplayer2/MPEGPlayer" ) ); |
104 | 104 | ||
105 | setToolBarsMovable( FALSE ); | 105 | setToolBarsMovable( FALSE ); |
106 | 106 | ||
107 | // Create Toolbar | 107 | // Create Toolbar |
108 | QPEToolBar *toolbar = new QPEToolBar( this ); | 108 | QPEToolBar *toolbar = new QPEToolBar( this ); |
109 | toolbar->setHorizontalStretchable( TRUE ); | 109 | toolbar->setHorizontalStretchable( TRUE ); |
110 | 110 | ||
111 | // Create Menubar | 111 | // Create Menubar |
112 | QPEMenuBar *menu = new QPEMenuBar( toolbar ); | 112 | QPEMenuBar *menu = new QPEMenuBar( toolbar ); |
113 | menu->setMargin( 0 ); | 113 | menu->setMargin( 0 ); |
114 | 114 | ||