summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/mediaplayer.cpp8
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidget.cpp2
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
@@ -33,8 +33,10 @@ extern MediaPlayerState *mediaPlayerState;
33 33
34MediaPlayer::MediaPlayer( QObject *parent, const char *name ) 34MediaPlayer::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
@@ -57,8 +59,9 @@ MediaPlayer::MediaPlayer( QObject *parent, const char *name )
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
63MediaPlayer::~MediaPlayer() { 66MediaPlayer::~MediaPlayer() {
64 delete xineControl; 67 delete xineControl;
@@ -262,9 +265,9 @@ void MediaPlayer::blank( bool b ) {
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
270void MediaPlayer::keyReleaseEvent( QKeyEvent *e) { 273void MediaPlayer::keyReleaseEvent( QKeyEvent *e) {
@@ -288,8 +291,9 @@ void MediaPlayer::keyReleaseEvent( QKeyEvent *e) {
288 break; 291 break;
289 } 292 }
290} 293}
291 294
292void MediaPlayer::cleanUp() { 295void 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
@@ -98,9 +98,9 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
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