Diffstat (limited to 'noncore/multimedia/opieplayer2/mediaplayer.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayer.cpp | 79 |
1 files changed, 46 insertions, 33 deletions
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp index 553e3c1..8da7f73 100644 --- a/noncore/multimedia/opieplayer2/mediaplayer.cpp +++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp @@ -38,3 +38,3 @@ MediaPlayer::MediaPlayer( QObject *parent, const char *name ) playList->setCaption(tr("OpiePlayer: Initializating")); - + qApp->processEvents(); @@ -102,27 +102,40 @@ void MediaPlayer::setPlaying( bool play ) { time.sprintf("%li:%02i", seconds/60, (int)seconds%60 ); - qDebug(time); - - } else { //if playing in file list.. play in a different way - // random and looping settings enabled causes problems here, - // since there is no selected file in the playlist, but a selected file in the file list, - // so we remember and shutoff + //qDebug(time); + + } else { + //if playing in file list.. play in a different way + // random and looping settings enabled causes problems here, + // since there is no selected file in the playlist, but a selected file in the file list, + // so we remember and shutoff l = mediaPlayerState->looping(); - if(l) + if(l) { mediaPlayerState->setLooping( false ); + } r = mediaPlayerState->shuffled(); - mediaPlayerState->setShuffled(false); - + mediaPlayerState->setShuffled( false ); + fileName = playList->currentFileListPathName(); - xineControl->play( fileName); - long seconds = mediaPlayerState->length();// + xineControl->play( fileName ); + long seconds = mediaPlayerState->length(); time.sprintf("%li:%02i", seconds/60, (int)seconds%60 ); - qDebug(time); - if( fileName.left(4) != "http" ) - fileName = QFileInfo( fileName).baseName(); + //qDebug(time); + if( fileName.left(4) != "http" ) { + fileName = QFileInfo( fileName ).baseName(); + } } - if( fileName.left(4) == "http" ) - tickerText= tr( " File: " ) + fileName; - else - tickerText = tr( " File: " ) + fileName + tr(", Length: ") + time; + + if( fileName.left(4) == "http" ) { + if ( xineControl->getMetaInfo().isEmpty() ) { + tickerText = tr( " File: " ) + fileName; + } else { + tickerText = xineControl->getMetaInfo(); + } + } else { + if ( xineControl->getMetaInfo().isEmpty() ) { + tickerText = tr( " File: " ) + fileName + tr( ", Length: " ) + time + " "; + } else { + tickerText = xineControl->getMetaInfo() + " Length: " + time + " "; + } + } audioUI->setTickerText( tickerText ); @@ -132,3 +145,3 @@ void MediaPlayer::setPlaying( bool play ) { void MediaPlayer::prev() { - if(playList->whichList() == 0) { //if using the playlist + if( playList->whichList() == 0 ) { //if using the playlist if ( playList->prev() ) { @@ -194,6 +207,6 @@ void MediaPlayer::stopChangingVolume() { int h=0; - if( !xineControl->hasVideo()) { + if( !xineControl->hasVideo() ) { w = audioUI->width(); h = audioUI->height(); - audioUI->repaint( (w - 200) / 2, h - yoff, 200 + 9, 70, FALSE ); + audioUI->repaint( ( w - 200 ) / 2, h - yoff, 200 + 9, 70, FALSE ); } else { @@ -201,3 +214,3 @@ void MediaPlayer::stopChangingVolume() { h = videoUI->height(); - videoUI->repaint( (w - 200) / 2, h - yoff, 200 + 9, 70, FALSE ); + videoUI->repaint( ( w - 200 ) / 2, h - yoff, 200 + 9, 70, FALSE ); } @@ -208,5 +221,5 @@ void MediaPlayer::timerEvent( QTimerEvent * ) { if ( volumeDirection == +1 ) { - volControl->incVol(2); - } else if ( volumeDirection == -1 ) { - volControl->decVol(2); + volControl->incVol( 2 ); + } else if ( volumeDirection == -1 ) { + volControl->decVol( 2 ); } @@ -225,3 +238,3 @@ void MediaPlayer::timerEvent( QTimerEvent * ) { int w=0; int h=0; - if( !xineControl->hasVideo()) { + if( !xineControl->hasVideo() ) { w = audioUI->width(); @@ -231,3 +244,3 @@ void MediaPlayer::timerEvent( QTimerEvent * ) { if ( onScreenDisplayVolume > v ) { - audioUI->repaint( (w - 200) / 2 + v * 20 + 0, h - yoff + 40, (onScreenDisplayVolume - v) * 20 + 9, 30, FALSE ); + audioUI->repaint( ( w - 200 ) / 2 + v * 20 + 0, h - yoff + 40, ( onScreenDisplayVolume - v ) * 20 + 9, 30, FALSE ); } @@ -248,5 +261,5 @@ void MediaPlayer::timerEvent( QTimerEvent * ) { if ( v > i ) { - p.drawRect( (w - 200) / 2 + i * 20 + 0, h - yoff + 40, 9, 30 ); + p.drawRect( ( w - 200 ) / 2 + i * 20 + 0, h - yoff + 40, 9, 30 ); } else { - p.drawRect( (w - 200) / 2 + i * 20 + 3, h - yoff + 50, 3, 10 ); + p.drawRect( ( w - 200 ) / 2 + i * 20 + 3, h - yoff + 50, 3, 10 ); } @@ -259,3 +272,3 @@ void MediaPlayer::timerEvent( QTimerEvent * ) { if ( onScreenDisplayVolume > v ) { - videoUI->repaint( (w - 200) / 2 + v * 20 + 0, h - yoff + 40, (onScreenDisplayVolume - v) * 20 + 9, 30, FALSE ); + videoUI->repaint( (w - 200) / 2 + v * 20 + 0, h - yoff + 40, ( onScreenDisplayVolume - v ) * 20 + 9, 30, FALSE ); } @@ -272,3 +285,3 @@ void MediaPlayer::timerEvent( QTimerEvent * ) { p.setFont( f ); - p.drawText( (w - 200) / 2, h - yoff + 20, tr("Volume") ); + p.drawText( (w - 200) / 2, h - yoff + 20, tr( "Volume" ) ); @@ -329,3 +342,3 @@ void MediaPlayer::cleanUp() {// this happens on closing playList->writeConfig( cfg ); - + // QPEApplication::grabKeyboard(); |