summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.cpp23
-rw-r--r--noncore/multimedia/opieplayer2/mediaplayer.cpp22
2 files changed, 35 insertions, 10 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index 300a5c8..303834a 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -98,7 +98,7 @@ static const int numButtons = (sizeof(audioButtons)/sizeof(MediaButton));
AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
QWidget( parent, name, f ), songInfo( this ), slider( Qt::Horizontal, this ), time( this ) {
setCaption( tr("OpiePlayer") );
-
+
Config cfg("OpiePlayer");
cfg.setGroup("AudioWidget");
skin = cfg.readEntry("Skin","default");
@@ -251,7 +251,7 @@ void AudioWidget::sliderReleased() {
}
void AudioWidget::setPosition( long i ) {
- // qDebug("set position %d",i);
+ qDebug("<<<<<<<<<<<<<<<<<<<<<<<<set position %d",i);
updateSlider( i, mediaPlayerState->length() );
}
@@ -262,17 +262,22 @@ void AudioWidget::setLength( long max ) {
void AudioWidget::setView( char view ) {
- if (mediaPlayerState->streaming() ) {
- if( !slider.isHidden()) slider.hide();
- disconnect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) );
- disconnect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) );
- } else {
+ slider.show();
+
+// this isnt working for some reason
+
+// if ( mediaPlayerState->streaming() ) {
+// qDebug("<<<<<<<<<<<<<<file is STREAMING>>>>>>>>>>>>>>>>>>>");
+// if( !slider.isHidden()) slider.hide();
+// disconnect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) );
+// disconnect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) );
+// } else {
// this stops the slider from being moved, thus
// does not stop stream when it reaches the end
slider.show();
connect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) );
connect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) );
- }
+// }
if ( view == 'a' ) {
startTimer( 150 );
@@ -292,7 +297,9 @@ static QString timeAsString( long length ) {
}
void AudioWidget::updateSlider( long i, long max ) {
+
time.setText( timeAsString( i ) + " / " + timeAsString( max ) );
+
if ( max == 0 ) {
return;
}
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp
index 13cc4ed..5411a64 100644
--- a/noncore/multimedia/opieplayer2/mediaplayer.cpp
+++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp
@@ -71,10 +71,28 @@ void MediaPlayer::setPlaying( bool play ) {
if ( playListCurrent != NULL ) {
currentFile = playListCurrent;
}
+
+ xineControl->play( currentFile->file() );
- audioUI->setTickerText( currentFile->file( ) );
+ xineControl->length();
+ long seconds = mediaPlayerState->length();//
+ QString time; time.sprintf("%li:%02i", seconds/60, (int)seconds%60 );
+ qDebug(time);
- xineControl->play( currentFile->file() );
+ QString tickerText;
+ if( currentFile->file().left(4) == "http" )
+ tickerText= tr( " File: " ) + currentFile->name();
+ else
+ tickerText = tr( " File: " ) + currentFile->name() + tr(", Length: ") + time;
+
+// QString fileInfo = mediaPlayerState->curDecoder()->fileInfo();
+
+// if ( !fileInfo.isEmpty() )
+// tickerText += ", " + fileInfo;
+// audioUI->setTickerText( tickerText + "." );
+
+ audioUI->setTickerText( currentFile->file( ) );
+
}