diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/Input/mpc/decoder_mpc.cpp | 1 | ||||
| -rw-r--r-- | src/plugins/Transports/http/httpstreamreader.cpp | 2 | ||||
| -rw-r--r-- | src/qmmp/decoderfactory.h | 2 | ||||
| -rw-r--r-- | src/qmmp/soundcore.cpp | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/src/plugins/Input/mpc/decoder_mpc.cpp b/src/plugins/Input/mpc/decoder_mpc.cpp index 93751a51f..1e90bc670 100644 --- a/src/plugins/Input/mpc/decoder_mpc.cpp +++ b/src/plugins/Input/mpc/decoder_mpc.cpp @@ -129,7 +129,6 @@ DecoderMPC::DecoderMPC(QIODevice *i) m_data = 0; } - DecoderMPC::~DecoderMPC() { m_len = 0; diff --git a/src/plugins/Transports/http/httpstreamreader.cpp b/src/plugins/Transports/http/httpstreamreader.cpp index b40f5b09f..a8d18816d 100644 --- a/src/plugins/Transports/http/httpstreamreader.cpp +++ b/src/plugins/Transports/http/httpstreamreader.cpp @@ -248,7 +248,7 @@ QString HttpStreamReader::contentType() void HttpStreamReader::abort() { m_mutex.lock(); - + m_ready = false; if (m_stream.aborted) { m_mutex.unlock(); diff --git a/src/qmmp/decoderfactory.h b/src/qmmp/decoderfactory.h index adeb0da4c..3d2901d7e 100644 --- a/src/qmmp/decoderfactory.h +++ b/src/qmmp/decoderfactory.h @@ -120,6 +120,6 @@ public: virtual QTranslator *createTranslator(QObject *parent) = 0; }; -Q_DECLARE_INTERFACE(DecoderFactory, "DecoderFactory/1.0"); +Q_DECLARE_INTERFACE(DecoderFactory, "DecoderFactory/1.0") #endif diff --git a/src/qmmp/soundcore.cpp b/src/qmmp/soundcore.cpp index d099a3dff..4b04b55b4 100644 --- a/src/qmmp/soundcore.cpp +++ b/src/qmmp/soundcore.cpp @@ -233,6 +233,8 @@ void SoundCore::startNextSource() m_url.clear(); s->deleteLater(); m_nextState = INVALID_SOURCE; + if(m_handler->state() == Qmmp::Stopped || m_handler->state() == Qmmp::Buffering) + m_handler->dispatch(Qmmp::NormalError); return; } |