aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/plugins/Transports/http/httpinputsource.h2
-rw-r--r--src/plugins/Transports/mms/mmsinputsource.h2
-rw-r--r--src/qmmp/emptyinputsource_p.h2
-rw-r--r--src/qmmp/fileinputsource_p.h2
-rw-r--r--src/qmmp/inputsource.cpp6
-rw-r--r--src/qmmp/inputsource.h8
-rw-r--r--src/qmmp/qmmpaudioengine.cpp22
-rw-r--r--src/qmmp/soundcore.cpp2
8 files changed, 23 insertions, 23 deletions
diff --git a/src/plugins/Transports/http/httpinputsource.h b/src/plugins/Transports/http/httpinputsource.h
index b0b69e640..d109589f3 100644
--- a/src/plugins/Transports/http/httpinputsource.h
+++ b/src/plugins/Transports/http/httpinputsource.h
@@ -32,7 +32,7 @@ class HTTPInputSource : public InputSource
{
Q_OBJECT
public:
- HTTPInputSource(const QString &url, QObject *parent = 0);
+ HTTPInputSource(const QString &path, QObject *parent = 0);
QIODevice *ioDevice();
bool initialize();
diff --git a/src/plugins/Transports/mms/mmsinputsource.h b/src/plugins/Transports/mms/mmsinputsource.h
index 5a2e748a8..c7105a6c5 100644
--- a/src/plugins/Transports/mms/mmsinputsource.h
+++ b/src/plugins/Transports/mms/mmsinputsource.h
@@ -32,7 +32,7 @@ class MMSInputSource : public InputSource
{
Q_OBJECT
public:
- MMSInputSource(const QString &url, QObject *parent = 0);
+ MMSInputSource(const QString &path, QObject *parent = 0);
QIODevice *ioDevice();
bool initialize();
diff --git a/src/qmmp/emptyinputsource_p.h b/src/qmmp/emptyinputsource_p.h
index 1898f8d9d..ae99b0bfc 100644
--- a/src/qmmp/emptyinputsource_p.h
+++ b/src/qmmp/emptyinputsource_p.h
@@ -30,7 +30,7 @@ class EmptyInputSource : public InputSource
{
Q_OBJECT
public:
- EmptyInputSource(const QString &url, QObject *parent = 0);
+ EmptyInputSource(const QString &path, QObject *parent = 0);
QIODevice *ioDevice();
bool initialize();
diff --git a/src/qmmp/fileinputsource_p.h b/src/qmmp/fileinputsource_p.h
index 171e7e4ea..0f310e640 100644
--- a/src/qmmp/fileinputsource_p.h
+++ b/src/qmmp/fileinputsource_p.h
@@ -32,7 +32,7 @@ class FileInputSource : public InputSource
{
Q_OBJECT
public:
- FileInputSource(const QString &url, QObject *parent = 0);
+ FileInputSource(const QString &path, QObject *parent = 0);
QIODevice *ioDevice();
bool initialize();
diff --git a/src/qmmp/inputsource.cpp b/src/qmmp/inputsource.cpp
index 8ba520486..68023ba54 100644
--- a/src/qmmp/inputsource.cpp
+++ b/src/qmmp/inputsource.cpp
@@ -28,7 +28,7 @@
InputSource::InputSource(const QString &source, QObject *parent) : QObject(parent)
{
- m_url = source;
+ m_path = source;
m_offset = -1;
m_hasMetaData = false;
m_hasStreamInfo = false;
@@ -44,9 +44,9 @@ QString InputSource::contentType() const
return QString();
}
-const QString InputSource::url() const
+const QString InputSource::path() const
{
- return m_url;
+ return m_path;
}
qint64 InputSource::offset() const
diff --git a/src/qmmp/inputsource.h b/src/qmmp/inputsource.h
index b8301d911..a5864a41e 100644
--- a/src/qmmp/inputsource.h
+++ b/src/qmmp/inputsource.h
@@ -44,7 +44,7 @@ public:
* @param url Input source path or url.
* @param parent Parent object.
*/
- InputSource(const QString &url, QObject *parent = 0);
+ InputSource(const QString &path, QObject *parent = 0);
/*!
* Returns QIODevice-based object for I/O operations.
* Subclass shoud reimplement this function.
@@ -72,7 +72,7 @@ public:
/*!
* Returns input source path or url.
*/
- const QString url() const;
+ const QString path() const;
/*!
* Returns start position in ms;
*/
@@ -117,7 +117,7 @@ public:
* @param parent Parent object.
* Returns \b 0 if the given url is not supported.
*/
- static InputSource *create(const QString &url, QObject *parent = 0);
+ static InputSource *create(const QString &path, QObject *parent = 0);
/*!
* Returns a list of transport factories.
*/
@@ -158,7 +158,7 @@ signals:
void error();
private:
- QString m_url;
+ QString m_path;
qint64 m_offset;
QMap<Qmmp::MetaData, QString> m_metaData;
QHash<QString, QString> m_streamInfo;
diff --git a/src/qmmp/qmmpaudioengine.cpp b/src/qmmp/qmmpaudioengine.cpp
index 3cf6b5b18..79421bfd0 100644
--- a/src/qmmp/qmmpaudioengine.cpp
+++ b/src/qmmp/qmmpaudioengine.cpp
@@ -119,7 +119,7 @@ bool QmmpAudioEngine::play()
bool QmmpAudioEngine::enqueue(InputSource *source)
{
mutex()->lock();
- if(m_decoder && m_decoder->nextURL() == source->url())
+ if(m_decoder && m_decoder->nextURL() == source->path())
{
m_inputs.value(m_decoder)->setOffset(source->offset());
delete source;
@@ -131,16 +131,16 @@ bool QmmpAudioEngine::enqueue(InputSource *source)
DecoderFactory *factory = 0;
- if(!source->url().contains("://"))
- factory = Decoder::findByFilePath(source->url(), m_settings->determineFileTypeByContent());
+ if(!source->path().contains("://"))
+ factory = Decoder::findByFilePath(source->path(), m_settings->determineFileTypeByContent());
if(!factory)
factory = Decoder::findByMime(source->contentType());
- if(factory && !factory->properties().noInput && source->ioDevice() && source->url().contains("://"))
+ if(factory && !factory->properties().noInput && source->ioDevice() && source->path().contains("://"))
factory = (factory->canDecode(source->ioDevice()) ? factory : 0);
- if(!factory && source->ioDevice() && source->url().contains("://")) //ignore content of local files
+ if(!factory && source->ioDevice() && source->path().contains("://")) //ignore content of local files
factory = Decoder::findByContent(source->ioDevice());
- if(!factory && source->url().contains("://"))
- factory = Decoder::findByProtocol(source->url().section("://",0,0));
+ if(!factory && source->path().contains("://"))
+ factory = Decoder::findByProtocol(source->path().section("://",0,0));
if(!factory)
{
qWarning("QmmpAudioEngine: unsupported file format");
@@ -149,7 +149,7 @@ bool QmmpAudioEngine::enqueue(InputSource *source)
qDebug("QmmpAudioEngine: selected decoder: %s",qPrintable(factory->properties().shortName));
if(factory->properties().noInput && source->ioDevice())
source->ioDevice()->close();
- Decoder *decoder = factory->create(source->url(), source->ioDevice());
+ Decoder *decoder = factory->create(source->path(), source->ioDevice());
if(!decoder->initialize())
{
qWarning("QmmpAudioEngine: invalid file format");
@@ -380,7 +380,7 @@ void QmmpAudioEngine::run()
if(m_decoder->hasMetaData())
{
QMap<Qmmp::MetaData, QString> m = m_decoder->takeMetaData();
- TrackInfo info(m_inputs[m_decoder]->url());
+ TrackInfo info(m_inputs[m_decoder]->path());
info.setValues(m);
StateHandler::instance()->dispatch(info);
m_trackInfo = QSharedPointer<TrackInfo>(new TrackInfo(info));
@@ -389,7 +389,7 @@ void QmmpAudioEngine::run()
if(m_inputs[m_decoder]->hasMetaData())
{
QMap<Qmmp::MetaData, QString> m = m_inputs[m_decoder]->takeMetaData();
- TrackInfo info(m_inputs[m_decoder]->url());
+ TrackInfo info(m_inputs[m_decoder]->path());
info.setValues(m);
StateHandler::instance()->dispatch(info);
m_trackInfo = QSharedPointer<TrackInfo>(new TrackInfo(info));
@@ -596,7 +596,7 @@ void QmmpAudioEngine::sendMetaData()
{
if(!m_decoder || m_inputs.isEmpty())
return;
- QString url = m_inputs.value(m_decoder)->url();
+ QString url = m_inputs.value(m_decoder)->path();
if (QFile::exists(url)) //send metadata for local files only
{
QList <TrackInfo *> list = MetaDataManager::instance()->createPlayList(url, TrackInfo::MetaData);
diff --git a/src/qmmp/soundcore.cpp b/src/qmmp/soundcore.cpp
index ce3863b55..ccd930471 100644
--- a/src/qmmp/soundcore.cpp
+++ b/src/qmmp/soundcore.cpp
@@ -266,7 +266,7 @@ void SoundCore::startNextSource()
return;
InputSource *s = m_sources.dequeue();
- m_path = s->url();
+ m_path = s->path();
if(s->ioDevice() && !s->ioDevice()->isOpen() && !s->ioDevice()->open(QIODevice::ReadOnly))
{
generated by cgit v1.2.3-13-gbd6f (git 2.30.0) at 2025-12-16 12:34:30 +0000