aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2008-10-01 20:19:52 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2008-10-01 20:19:52 +0000
commit4bd77573e83df590f114bbe845506458d2981d50 (patch)
tree037623218343f21700fd6b4708e483df24791bef
parentb1e7189981908fdc53de008f6929220529043b59 (diff)
downloadqmmp-4bd77573e83df590f114bbe845506458d2981d50.tar.gz
qmmp-4bd77573e83df590f114bbe845506458d2981d50.tar.bz2
qmmp-4bd77573e83df590f114bbe845506458d2981d50.zip
decoder api changes
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@573 90c681e8-e032-0410-971d-27865f9a5e38
-rw-r--r--src/plugins/Input/mad/decodermadfactory.cpp2
-rw-r--r--src/plugins/Input/mad/decodermadfactory.h2
-rw-r--r--src/plugins/Input/vorbis/decodervorbisfactory.cpp2
-rw-r--r--src/plugins/Input/vorbis/decodervorbisfactory.h2
-rw-r--r--src/qmmp/decoder.cpp4
-rw-r--r--src/qmmp/decoder.h2
-rw-r--r--src/qmmp/decoderfactory.h2
-rw-r--r--src/qmmp/soundcore.cpp2
-rw-r--r--src/ui/playlistitem.cpp4
9 files changed, 11 insertions, 11 deletions
diff --git a/src/plugins/Input/mad/decodermadfactory.cpp b/src/plugins/Input/mad/decodermadfactory.cpp
index 0d66c68a2..c41ab6fe9 100644
--- a/src/plugins/Input/mad/decodermadfactory.cpp
+++ b/src/plugins/Input/mad/decodermadfactory.cpp
@@ -99,7 +99,7 @@ Decoder *DecoderMADFactory::create(QObject *parent, QIODevice *input, Output *ou
return new DecoderMAD(parent, this, input, output);
}
-FileInfo *DecoderMADFactory::getFileInfo(const QString &source)
+FileInfo *DecoderMADFactory::createFileInfo(const QString &source)
{
FileInfo *info = new FileInfo();
TagLib::Tag *tag = 0;
diff --git a/src/plugins/Input/mad/decodermadfactory.h b/src/plugins/Input/mad/decodermadfactory.h
index de51f2450..b455f360e 100644
--- a/src/plugins/Input/mad/decodermadfactory.h
+++ b/src/plugins/Input/mad/decodermadfactory.h
@@ -43,7 +43,7 @@ public:
bool canDecode(QIODevice *input) const;
const DecoderProperties properties() const;
Decoder *create(QObject *, QIODevice *, Output *, const QString &);
- FileInfo *getFileInfo(const QString &source);
+ FileInfo *createFileInfo(const QString &source);
QObject* showDetails(QWidget *parent, const QString &path);
void showSettings(QWidget *parent);
void showAbout(QWidget *parent);
diff --git a/src/plugins/Input/vorbis/decodervorbisfactory.cpp b/src/plugins/Input/vorbis/decodervorbisfactory.cpp
index 2bc97a8f7..ceb0083ba 100644
--- a/src/plugins/Input/vorbis/decodervorbisfactory.cpp
+++ b/src/plugins/Input/vorbis/decodervorbisfactory.cpp
@@ -63,7 +63,7 @@ Decoder *DecoderVorbisFactory::create(QObject *parent, QIODevice *input,
return new DecoderVorbis(parent, this, input, output);
}
-FileInfo *DecoderVorbisFactory::getFileInfo(const QString &source)
+FileInfo *DecoderVorbisFactory::createFileInfo(const QString &source)
{
FileInfo *info = new FileInfo();
diff --git a/src/plugins/Input/vorbis/decodervorbisfactory.h b/src/plugins/Input/vorbis/decodervorbisfactory.h
index f2d42b695..811f2edc4 100644
--- a/src/plugins/Input/vorbis/decodervorbisfactory.h
+++ b/src/plugins/Input/vorbis/decodervorbisfactory.h
@@ -44,7 +44,7 @@ public:
bool canDecode(QIODevice *input) const;
const DecoderProperties properties() const;
Decoder *create(QObject *, QIODevice *, Output *, const QString &);
- FileInfo *getFileInfo(const QString &source);
+ FileInfo *createFileInfo(const QString &source);
QObject* showDetails(QWidget *parent, const QString &path);
void showSettings(QWidget *parent);
void showAbout(QWidget *parent);
diff --git a/src/qmmp/decoder.cpp b/src/qmmp/decoder.cpp
index a931faab3..c4404b739 100644
--- a/src/qmmp/decoder.cpp
+++ b/src/qmmp/decoder.cpp
@@ -400,12 +400,12 @@ bool Decoder::isEnabled(DecoderFactory* factory)
return !disabledList.contains(name);
}
-FileInfo *Decoder::getFileInfo(const QString &fileName)
+FileInfo *Decoder::createFileInfo(const QString &fileName)
{
DecoderFactory *fact = Decoder::findByPath(fileName);
if (fact && QFile::exists(fileName))
{
- return fact->getFileInfo(fileName);
+ return fact->createFileInfo(fileName);
}
return 0;
}
diff --git a/src/qmmp/decoder.h b/src/qmmp/decoder.h
index 33404855c..feaa5dd85 100644
--- a/src/qmmp/decoder.h
+++ b/src/qmmp/decoder.h
@@ -64,7 +64,7 @@ public:
static DecoderFactory *findByMime(const QString&);
static DecoderFactory *findByContent(QIODevice *);
static DecoderFactory *findByURL(const QUrl &url);
- static FileInfo *getFileInfo(const QString &fileName);
+ static FileInfo *createFileInfo(const QString &fileName);
static QStringList filters();
static QStringList nameFilters();
static QList<DecoderFactory*> *factories();
diff --git a/src/qmmp/decoderfactory.h b/src/qmmp/decoderfactory.h
index c7f3f47da..0bfb6d0ef 100644
--- a/src/qmmp/decoderfactory.h
+++ b/src/qmmp/decoderfactory.h
@@ -64,7 +64,7 @@ public:
virtual const DecoderProperties properties() const = 0;
virtual Decoder *create(QObject *, QIODevice *input = 0,
Output *output = 0, const QString &path = QString()) = 0;
- virtual FileInfo *getFileInfo(const QString &source) = 0;
+ virtual FileInfo *createFileInfo(const QString &source) = 0;
virtual QObject* showDetails(QWidget *parent, const QString &path) = 0;
virtual void showSettings(QWidget *parent) = 0;
virtual void showAbout(QWidget *parent) = 0;
diff --git a/src/qmmp/soundcore.cpp b/src/qmmp/soundcore.cpp
index 9180b486a..7cb59cb05 100644
--- a/src/qmmp/soundcore.cpp
+++ b/src/qmmp/soundcore.cpp
@@ -98,7 +98,7 @@ bool SoundCore::play(const QString &source)
m_handler->dispatch(Qmmp::NormalError);
return FALSE;
}
- FileInfo *finfo = m_factory->getFileInfo(m_url.toLocalFile ());
+ FileInfo *finfo = m_factory->createFileInfo(m_url.toLocalFile ());
m_handler->dispatch(finfo->metaData());
delete finfo;
return decode();
diff --git a/src/ui/playlistitem.cpp b/src/ui/playlistitem.cpp
index 0759e3354..b5321c8ca 100644
--- a/src/ui/playlistitem.cpp
+++ b/src/ui/playlistitem.cpp
@@ -47,7 +47,7 @@ PlayListItem::PlayListItem(const QString& path) : SongInfo(), m_flag(FREE)
if (m_use_meta && !path.startsWith("http://"))
{
- m_info = Decoder::getFileInfo(path);
+ m_info = Decoder::createFileInfo(path);
readMetadata();
}
else if (path.startsWith("http://") && m_fullStreamPath)
@@ -111,7 +111,7 @@ void PlayListItem::updateTags()
delete m_info;
m_info = 0;
}
- m_info = Decoder::getFileInfo(path());
+ m_info = Decoder::createFileInfo(path());
readMetadata();
}