| author | llornkcor <llornkcor> | 2002-04-21 03:26:09 (UTC) |
|---|---|---|
| committer | llornkcor <llornkcor> | 2002-04-21 03:26:09 (UTC) |
| commit | 6818807a46b80774de328b4c3001d4bc9d788666 (patch) (side-by-side diff) | |
| tree | 1bede7ebbb324058b664330abf481f7afb25eb73 /core/multimedia/opieplayer | |
| parent | 1c459273c0e9e387fd5fe2e2c05bef4db5bce115 (diff) | |
| download | opie-6818807a46b80774de328b4c3001d4bc9d788666.zip opie-6818807a46b80774de328b4c3001d4bc9d788666.tar.gz opie-6818807a46b80774de328b4c3001d4bc9d788666.tar.bz2 | |
fixed when playing stream, slider moved and stopped stream when it reached the end
| -rw-r--r-- | core/multimedia/opieplayer/audiowidget.cpp | 7 | ||||
| -rw-r--r-- | core/multimedia/opieplayer/audiowidget.h | 2 | ||||
| -rw-r--r-- | core/multimedia/opieplayer/loopcontrol.cpp | 4 | ||||
| -rw-r--r-- | core/multimedia/opieplayer/mediaplayerstate.h | 2 | ||||
| -rw-r--r-- | core/multimedia/opieplayer/playlistwidget.cpp | 1 |
5 files changed, 12 insertions, 4 deletions
diff --git a/core/multimedia/opieplayer/audiowidget.cpp b/core/multimedia/opieplayer/audiowidget.cpp index 3212001..20345b7 100644 --- a/core/multimedia/opieplayer/audiowidget.cpp +++ b/core/multimedia/opieplayer/audiowidget.cpp @@ -90,4 +90,2 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) : connect( mediaPlayerState, SIGNAL( lengthChanged(long) ), this, SLOT( setLength(long) ) ); - connect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); - connect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); connect( mediaPlayerState, SIGNAL( viewChanged(char) ), this, SLOT( setView(char) ) ); @@ -97,2 +95,7 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) : + if( !mediaPlayerState->isStreaming) { // this stops the slider from being moved, thus + // does not stop stream when it reaches the end + connect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); + connect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); + } // Intialise state diff --git a/core/multimedia/opieplayer/audiowidget.h b/core/multimedia/opieplayer/audiowidget.h index d1d72b6..4ffd167 100644 --- a/core/multimedia/opieplayer/audiowidget.h +++ b/core/multimedia/opieplayer/audiowidget.h @@ -104,3 +104,3 @@ public: void setTickerText( const QString &text ) { songInfo->setText( text ); } - + bool isStreaming; public slots: diff --git a/core/multimedia/opieplayer/loopcontrol.cpp b/core/multimedia/opieplayer/loopcontrol.cpp index b9f96de..45c2d3e 100644 --- a/core/multimedia/opieplayer/loopcontrol.cpp +++ b/core/multimedia/opieplayer/loopcontrol.cpp @@ -238,2 +238,3 @@ void LoopControl::startAudio() { +// this causes drop outs not sure why its even here // if ( ( sampleWaitTime > 2000 ) && ( sampleWaitTime < 20000 ) ) { @@ -434,2 +435,5 @@ bool LoopControl::init( const QString& filename ) { + if( fileName.left(7) == "http://") + mediaPlayerState->isStreaming = TRUE; + connect( mediaPlayerState, SIGNAL( positionChanged( long ) ), this, SLOT( setPosition( long ) ) ); diff --git a/core/multimedia/opieplayer/mediaplayerstate.h b/core/multimedia/opieplayer/mediaplayerstate.h index ad273f1..06c5556 100644 --- a/core/multimedia/opieplayer/mediaplayerstate.h +++ b/core/multimedia/opieplayer/mediaplayerstate.h @@ -36,3 +36,3 @@ public: - + bool isStreaming; bool fullscreen() { return isFullscreen; } diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp index 250645c..ff156f8 100644 --- a/core/multimedia/opieplayer/playlistwidget.cpp +++ b/core/multimedia/opieplayer/playlistwidget.cpp @@ -995,2 +995,3 @@ void PlayListWidget::openFile() { //http://205.188.234.129:8030 +// http://66.28.68.70:8000 qDebug(filename); |