summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-08-20 02:12:07 (UTC)
committer llornkcor <llornkcor>2002-08-20 02:12:07 (UTC)
commit16b105a34b4e525cf6690e55beacf4baa57e60d7 (patch) (side-by-side diff)
tree8e3713e7483e11bbbe5ff7133bf505ca266a49e0
parent0d336f310b310ba18af70185eed58be6e07c26d8 (diff)
downloadopie-16b105a34b4e525cf6690e55beacf4baa57e60d7.zip
opie-16b105a34b4e525cf6690e55beacf4baa57e60d7.tar.gz
opie-16b105a34b4e525cf6690e55beacf4baa57e60d7.tar.bz2
added 'initialzing' message to caption, until after xine is initialized
Diffstat (more/less context) (show 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
@@ -31,12 +31,14 @@ extern MediaPlayerState *mediaPlayerState;
#define FBIOBLANK 0x4611
MediaPlayer::MediaPlayer( QObject *parent, const char *name )
: QObject( parent, name ), volumeDirection( 0 ), currentFile( NULL ) {
+ playList->setCaption(tr("OpiePlayer: Initializating"));
+
qApp->processEvents();
// QPEApplication::grabKeyboard(); // EVIL
connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( setPlaying( bool ) ) );
@@ -55,12 +57,13 @@ MediaPlayer::MediaPlayer( QObject *parent, const char *name )
connect( videoUI, SIGNAL( lessClicked() ), this, SLOT( startDecreasingVolume() ) );
connect( videoUI, SIGNAL( moreReleased() ), this, SLOT( stopChangingVolume() ) );
connect( videoUI, SIGNAL( lessReleased() ), this, SLOT( stopChangingVolume() ) );
volControl = new VolumeControl;
xineControl = new XineControl();
+ playList->setCaption(tr("OpiePlayer"));
}
MediaPlayer::~MediaPlayer() {
delete xineControl;
delete volControl;
}
@@ -260,13 +263,13 @@ void MediaPlayer::blank( bool b ) {
qDebug("do unblanking");
ioctl( fd, FBIOBLANK, 0);
isBlanked = FALSE;
}
close( fd );
} else {
- qDebug("<< /dev/fb0 could not be opend >>");
+ qDebug("<< /dev/fb0 could not be opened >>");
}
}
void MediaPlayer::keyReleaseEvent( QKeyEvent *e) {
switch ( e->key() ) {
////////////////////////////// Zaurus keys
@@ -286,10 +289,11 @@ void MediaPlayer::keyReleaseEvent( QKeyEvent *e) {
qDebug("Blank here");
// mediaPlayerState->toggleBlank();
break;
}
}
-void MediaPlayer::cleanUp() {
+void MediaPlayer::cleanUp() {// this happens on closing
+
// QPEApplication::grabKeyboard();
// QPEApplication::ungrabKeyboard();
}
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
@@ -96,13 +96,13 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
insanityBool=FALSE;
audioScan = FALSE;
videoScan = FALSE;
setBackgroundMode( PaletteButton );
- setCaption( tr("OpiePlayer") );
+// setCaption( tr("OpiePlayer") );
setIcon( Resource::loadPixmap( "opieplayer2/MPEGPlayer" ) );
setToolBarsMovable( FALSE );
// Create Toolbar
QPEToolBar *toolbar = new QPEToolBar( this );