diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2010-02-22 18:22:59 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2010-02-22 18:22:59 +0000 |
| commit | c2fe77fd3613beea298aaa568d27a2409b6455da (patch) | |
| tree | 2ceef9695f5e29101881411e087a64585c876207 /src | |
| parent | 36460a06f31ca92371d84d59bd9dd52f0c5a46a0 (diff) | |
| download | qmmp-c2fe77fd3613beea298aaa568d27a2409b6455da.tar.gz qmmp-c2fe77fd3613beea298aaa568d27a2409b6455da.tar.bz2 qmmp-c2fe77fd3613beea298aaa568d27a2409b6455da.zip | |
fixed regression
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1567 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src')
| -rw-r--r-- | src/qmmp/soundcore.cpp | 9 | ||||
| -rw-r--r-- | src/qmmp/soundcore.h | 4 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/qmmp/soundcore.cpp b/src/qmmp/soundcore.cpp index 35654581f..86fb7c0db 100644 --- a/src/qmmp/soundcore.cpp +++ b/src/qmmp/soundcore.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006-2009 by Ilya Kotov * + * Copyright (C) 2006-2010 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -101,7 +101,7 @@ bool SoundCore::play(const QString &source, bool queue) void SoundCore::stop() { - m_source.clear(); + m_url.clear(); if(m_engine) m_engine->stop(); qDeleteAll(m_pendingSources); @@ -131,7 +131,7 @@ void SoundCore::seek(qint64 pos) const QString SoundCore::url() { - return m_source; + return m_url; } qint64 SoundCore::totalTime() const @@ -235,6 +235,7 @@ QString SoundCore::metaData(Qmmp::MetaData key) bool SoundCore::enqueue(InputSource *s) { m_pendingSources.removeAll(s); + m_url = s->url(); if(!m_engine) { m_engine = new QmmpAudioEngine(this); @@ -245,7 +246,6 @@ bool SoundCore::enqueue(InputSource *s) setEQEnabled(m_useEQ); if(m_engine->enqueue(s)) { - m_source = s->url(); if(state() == Qmmp::Stopped || state() == Qmmp::Buffering) m_engine->play(); } @@ -261,7 +261,6 @@ bool SoundCore::enqueue(InputSource *s) if(!engine) { - QList <EngineFactory*> factories = *AbstractEngine::factories(); foreach(EngineFactory *f, *AbstractEngine::factories()) { engine = f->create(this); //engine plugin diff --git a/src/qmmp/soundcore.h b/src/qmmp/soundcore.h index aaf32a8fa..14ba2bc30 100644 --- a/src/qmmp/soundcore.h +++ b/src/qmmp/soundcore.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006-2009 by Ilya Kotov * + * Copyright (C) 2006-2010 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -203,7 +203,7 @@ private slots: private: Decoder* m_decoder; - QString m_source; + QString m_url; uint m_error; bool m_paused; bool m_useEQ; |