author | llornkcor <llornkcor> | 2002-08-20 02:12:07 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-08-20 02:12:07 (UTC) |
commit | 16b105a34b4e525cf6690e55beacf4baa57e60d7 (patch) (unidiff) | |
tree | 8e3713e7483e11bbbe5ff7133bf505ca266a49e0 /noncore/multimedia/opieplayer2/mediaplayer.cpp | |
parent | 0d336f310b310ba18af70185eed58be6e07c26d8 (diff) | |
download | opie-16b105a34b4e525cf6690e55beacf4baa57e60d7.zip opie-16b105a34b4e525cf6690e55beacf4baa57e60d7.tar.gz opie-16b105a34b4e525cf6690e55beacf4baa57e60d7.tar.bz2 |
added 'initialzing' message to caption, until after xine is initialized
Diffstat (limited to 'noncore/multimedia/opieplayer2/mediaplayer.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayer.cpp | 8 |
1 files changed, 6 insertions, 2 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; | |||
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()) ); |
@@ -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 | ||
63 | MediaPlayer::~MediaPlayer() { | 66 | MediaPlayer::~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 | ||
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 | } |