aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/qmmp/decoder.cpp22
-rw-r--r--src/qmmp/decoder.h4
-rw-r--r--src/qmmp/plugincache.cpp12
-rw-r--r--src/qmmp/plugincache.h4
4 files changed, 21 insertions, 21 deletions
diff --git a/src/qmmp/decoder.cpp b/src/qmmp/decoder.cpp
index 1f0c1d4c4..197ba3569 100644
--- a/src/qmmp/decoder.cpp
+++ b/src/qmmp/decoder.cpp
@@ -84,7 +84,7 @@ QMap<Qmmp::MetaData, QString> Decoder::takeMetaData()
// static methods
QStringList Decoder::m_disabledNames;
DecoderFactory *Decoder::m_lastFactory = 0;
-QList<PluginCache*> *Decoder::m_cache = 0;
+QList<QmmpPluginCache*> *Decoder::m_cache = 0;
//sort cache items by priority
/*static bool _decoderLessComparator(DecoderFactory* f1, DecoderFactory* f2)
@@ -97,13 +97,13 @@ void Decoder::checkFactories()
if (m_cache)
return;
- m_cache = new QList<PluginCache*>;
+ m_cache = new QList<QmmpPluginCache*>;
QSettings settings (Qmmp::configFile(), QSettings::IniFormat);
QDir pluginsDir (Qmmp::pluginsPath());
pluginsDir.cd("Input");
foreach (QString fileName, pluginsDir.entryList(QDir::Files))
{
- PluginCache *item = new PluginCache(pluginsDir.absoluteFilePath(fileName), &settings);
+ QmmpPluginCache *item = new QmmpPluginCache(pluginsDir.absoluteFilePath(fileName), &settings);
if(item->hasError())
{
delete item;
@@ -117,7 +117,7 @@ void Decoder::checkFactories()
QString Decoder::file(DecoderFactory *factory)
{
checkFactories();
- foreach(PluginCache *item, *m_cache)
+ foreach(QmmpPluginCache *item, *m_cache)
{
if(item->shortName() == factory->properties().shortName)
return item->file();
@@ -130,7 +130,7 @@ QStringList Decoder::protocols()
checkFactories();
QStringList protocolsList;
- foreach (PluginCache *item, *m_cache)
+ foreach (QmmpPluginCache *item, *m_cache)
{
if(m_disabledNames.contains(item->shortName()))
continue;
@@ -165,7 +165,7 @@ DecoderFactory *Decoder::findByPath(const QString& source, bool useContent)
return fact;
}
- foreach(PluginCache *item, *m_cache)
+ foreach(QmmpPluginCache *item, *m_cache)
{
if(m_disabledNames.contains(item->shortName()))
continue;
@@ -186,7 +186,7 @@ DecoderFactory *Decoder::findByPath(const QString& source, bool useContent)
if (fact && isEnabled(fact) && fact->supports(source)) //try last factory
return fact;
- foreach (PluginCache *item, *m_cache)
+ foreach (QmmpPluginCache *item, *m_cache)
{
if(m_disabledNames.contains(item->shortName()))
continue;
@@ -205,7 +205,7 @@ DecoderFactory *Decoder::findByMime(const QString& type)
if(type.isEmpty())
return 0;
checkFactories();
- foreach (PluginCache *item, *m_cache)
+ foreach (QmmpPluginCache *item, *m_cache)
{
if(m_disabledNames.contains(item->shortName()))
continue;
@@ -219,7 +219,7 @@ DecoderFactory *Decoder::findByMime(const QString& type)
DecoderFactory *Decoder::findByContent(QIODevice *input)
{
checkFactories();
- foreach (PluginCache *item, *m_cache)
+ foreach (QmmpPluginCache *item, *m_cache)
{
if(m_disabledNames.contains(item->shortName()))
continue;
@@ -233,7 +233,7 @@ DecoderFactory *Decoder::findByContent(QIODevice *input)
DecoderFactory *Decoder::findByProtocol(const QString &p)
{
checkFactories();
- foreach (PluginCache *item, *m_cache)
+ foreach (QmmpPluginCache *item, *m_cache)
{
if(m_disabledNames.contains(item->shortName()))
continue;
@@ -273,7 +273,7 @@ QList<DecoderFactory *> Decoder::factories()
{
checkFactories();
QList<DecoderFactory *> list;
- foreach (PluginCache *item, *m_cache)
+ foreach (QmmpPluginCache *item, *m_cache)
{
if(item->decoderFactory())
list.append(item->decoderFactory());
diff --git a/src/qmmp/decoder.h b/src/qmmp/decoder.h
index 2b250774d..1298c1891 100644
--- a/src/qmmp/decoder.h
+++ b/src/qmmp/decoder.h
@@ -20,7 +20,7 @@
class Decoder;
class DecoderFactory;
class QIODevice;
-class PluginCache;
+class QmmpPluginCache;
/*! @brief The Decoder class provides the base interface class of audio decoders.
* @author Brad Hughes <bhughes@trolltech.com>
@@ -164,7 +164,7 @@ protected:
private:
static void checkFactories();
static DecoderFactory *m_lastFactory;
- static QList<PluginCache*> *m_cache;
+ static QList<QmmpPluginCache*> *m_cache;
static QStringList m_disabledNames;
AudioParameters m_parameters;
QIODevice *m_input;
diff --git a/src/qmmp/plugincache.cpp b/src/qmmp/plugincache.cpp
index 4be3e6164..a1eed8621 100644
--- a/src/qmmp/plugincache.cpp
+++ b/src/qmmp/plugincache.cpp
@@ -28,7 +28,7 @@
#include "outputfactory.h"
#include "plugincache.h"
-PluginCache::PluginCache(const QString &file, QSettings *settings)
+QmmpPluginCache::QmmpPluginCache(const QString &file, QSettings *settings)
{
m_error = false;
m_instance = 0;
@@ -80,17 +80,17 @@ PluginCache::PluginCache(const QString &file, QSettings *settings)
settings->endGroup();
}
-const QString PluginCache::shortName() const
+const QString QmmpPluginCache::shortName() const
{
return m_shortName;
}
-const QString PluginCache::file() const
+const QString QmmpPluginCache::file() const
{
return m_path;
}
-DecoderFactory *PluginCache::decoderFactory()
+DecoderFactory *QmmpPluginCache::decoderFactory()
{
if(!m_decoderFactory)
{
@@ -101,12 +101,12 @@ DecoderFactory *PluginCache::decoderFactory()
return m_decoderFactory;
}
-bool PluginCache::hasError() const
+bool QmmpPluginCache::hasError() const
{
return m_error;
}
-QObject *PluginCache::instance()
+QObject *QmmpPluginCache::instance()
{
if(m_error)
return 0;
diff --git a/src/qmmp/plugincache.h b/src/qmmp/plugincache.h
index 34aa4427f..b258fd5e2 100644
--- a/src/qmmp/plugincache.h
+++ b/src/qmmp/plugincache.h
@@ -30,10 +30,10 @@ class DecoderFactory;
/*! @internal
* @author Ilya Kotov <forkotov02@hotmail.ru>
*/
-class PluginCache
+class QmmpPluginCache
{
public:
- PluginCache(const QString &file, QSettings *settings);
+ QmmpPluginCache(const QString &file, QSettings *settings);
const QString shortName() const;
const QString file() const;
generated by cgit v1.2.3-13-gbd6f (git 2.30.0) at 2025-12-16 12:20:26 +0000