aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2012-03-01 20:00:22 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2012-03-01 20:00:22 +0000
commitfc971548f30abd6f739a8970f8a2b57f14b6416a (patch)
treea6d277d1c42830b408b2854aa8449f2708043b58
parentdbc7634dae1e20b61a99073259501856ee1a3173 (diff)
downloadqmmp-fc971548f30abd6f739a8970f8a2b57f14b6416a.tar.gz
qmmp-fc971548f30abd6f739a8970f8a2b57f14b6416a.tar.bz2
qmmp-fc971548f30abd6f739a8970f8a2b57f14b6416a.zip
do not use content type for decoders with file based input
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2666 90c681e8-e032-0410-971d-27865f9a5e38
-rw-r--r--src/qmmp/decoder.cpp18
1 files changed, 2 insertions, 16 deletions
diff --git a/src/qmmp/decoder.cpp b/src/qmmp/decoder.cpp
index a20f64b8b..9b69bd401 100644
--- a/src/qmmp/decoder.cpp
+++ b/src/qmmp/decoder.cpp
@@ -219,27 +219,13 @@ DecoderFactory *Decoder::findByMime(const QString& type)
DecoderFactory *fact;
foreach(fact, *m_factories)
{
- if (isEnabled(fact) && fact->properties().contentTypes.contains(type))
+ if (isEnabled(fact) && !fact->properties().noInput
+ && fact->properties().contentTypes.contains(type))
return fact;
}
return 0;
}
-/*DecoderFactory *Decoder::findByContent(const QString &path)
-{
- checkFactories();
- QFile file(path);
- if(!file.open(QIODevice::ReadOnly))
- {
- qWarning("Decoder: file open error: %s", qPrintable(file.errorString()));
- return 0;
- }
- QByteArray array = file.read(8192);
- QBuffer buffer(&array);
- buffer.open(QIODevice::ReadOnly);
- return findByContent(&buffer);
-}*/
-
DecoderFactory *Decoder::findByContent(QIODevice *input)
{
checkFactories();