summaryrefslogtreecommitdiff
path: root/noncore
authorllornkcor <llornkcor>2002-08-20 02:12:07 (UTC)
committer llornkcor <llornkcor>2002-08-20 02:12:07 (UTC)
commit16b105a34b4e525cf6690e55beacf4baa57e60d7 (patch) (unidiff)
tree8e3713e7483e11bbbe5ff7133bf505ca266a49e0 /noncore
parent0d336f310b310ba18af70185eed58be6e07c26d8 (diff)
downloadopie-16b105a34b4e525cf6690e55beacf4baa57e60d7.zip
opie-16b105a34b4e525cf6690e55beacf4baa57e60d7.tar.gz
opie-16b105a34b4e525cf6690e55beacf4baa57e60d7.tar.bz2
added 'initialzing' message to caption, until after xine is initialized
Diffstat (limited to 'noncore') (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
@@ -34,6 +34,8 @@ extern MediaPlayerState *mediaPlayerState;
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()) );
@@ -58,6 +60,7 @@ MediaPlayer::MediaPlayer( QObject *parent, const char *name )
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() {
@@ -263,7 +266,7 @@ void MediaPlayer::blank( bool b ) {
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
@@ -289,7 +292,8 @@ void MediaPlayer::keyReleaseEvent( QKeyEvent *e) {
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
@@ -99,7 +99,7 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
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 );