archive plugin: prepare for tag reader implementation

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@6729 90c681e8-e032-0410-971d-27865f9a5e38

1 files changed, 9 insertions, 13 deletions

diff --git a/src/plugins/Input/archive/decoder_archive.cpp b/src/plugins/Input/archive/decoder_archive.cpp
index 89f93cf9a..24e7f15d5 100644
--- a/src/plugins/Input/archive/decoder_archive.cpp
+++ b/src/plugins/Input/archive/decoder_archive.cpp
@@ -40,7 +40,7 @@ bool DecoderArchive::initialize()
 
     if(!QFile::exists(archivePath))
     {
-        qWarning("DecoderArc: file '%s' not found", qPrintable(archivePath));
+        qWarning("DecoderArchive: file '%s' not found", qPrintable(archivePath));
         return false;
     }
 
@@ -63,7 +63,7 @@ bool DecoderArchive::initialize()
 
     if(filtered.isEmpty())
     {
-        qWarning("DecoderArc: unable to find decoder");
+        qWarning("DecoderArchive: unable to find decoder");
         return false;
     }
 
@@ -74,7 +74,7 @@ bool DecoderArchive::initialize()
     int r = archive_read_open_filename(m_archive, archivePath.toLocal8Bit().constData(), 10240);
     if (r != ARCHIVE_OK)
     {
-        qWarning("DecoderArc: unable to open file '%s', error code: %d", qPrintable(archivePath), r);
+        qWarning("DecoderArchive: unable to open file '%s', error code: %d", qPrintable(archivePath), r);
         return false;
     }
 
@@ -96,7 +96,7 @@ bool DecoderArchive::initialize()
 
     if(!m_input)
     {
-        qWarning("DecoderArc: unable to find file '%s' inside archive '%s'", qPrintable(filePath),
+        qWarning("DecoderArchive: unable to find file '%s' inside archive '%s'", qPrintable(filePath),
                  qPrintable(archivePath));
         return false;
     }
@@ -106,7 +106,7 @@ bool DecoderArchive::initialize()
         factory = filtered.first();
     else
     {
-        //several factories, so trying to determine by content
+        //multiple factories, so trying to determine by content
         foreach (DecoderFactory *fact, filtered)
         {
             if(fact->canDecode(m_input))
@@ -119,22 +119,18 @@ bool DecoderArchive::initialize()
 
     if(!factory)
     {
-        qWarning("DecoderArc: unable to find supported decoder factory");
+        qWarning("DecoderArchive: unable to find decoder factory");
         return false;
     }
 
-    qDebug("DecoderArc: selected decoder: %s", qPrintable(factory->properties().shortName));
-    qDebug("+");
+    qDebug("DecoderArchive: selected decoder: %s", qPrintable(factory->properties().shortName));
     m_decoder = factory->create(m_url, m_input);
-    qDebug("+1");
     if(!m_decoder->initialize())
     {
-        qWarning("DecoderArc: unable to initialize decoder");
+        qWarning("DecoderArchive: unable to initialize decoder");
         return false;
     }
-    qDebug("+2");
-    configure(m_decoder->audioParameters().sampleRate(), m_decoder->audioParameters().channelMap(),
-              m_decoder->audioParameters().format());
+    configure(m_decoder->audioParameters());
     return true;
 }