added full icy metadata output (Closes issue 120)(Closes issue 470)

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

3 files changed, 4 insertions, 3 deletions

diff --git a/src/plugins/Transports/http/httpinputfactory.cpp b/src/plugins/Transports/http/httpinputfactory.cpp
index e21effae4..9a0b9fe1b 100644
--- a/src/plugins/Transports/http/httpinputfactory.cpp
+++ b/src/plugins/Transports/http/httpinputfactory.cpp
@@ -64,4 +64,4 @@ QTranslator *HTTPInputFactory::createTranslator(QObject *parent)
     translator->load(QString(":/http_plugin_") + locale);
     return translator;
 }
-Q_EXPORT_PLUGIN2(http, HTTPInputFactory);
+Q_EXPORT_PLUGIN2(http, HTTPInputFactory)
diff --git a/src/plugins/Transports/http/httpstreamreader.cpp b/src/plugins/Transports/http/httpstreamreader.cpp
index f82a1950c..0013eb3b5 100644
--- a/src/plugins/Transports/http/httpstreamreader.cpp
+++ b/src/plugins/Transports/http/httpstreamreader.cpp
@@ -372,6 +372,7 @@ void HttpStreamReader::checkBuffer()
             }
             metaData.insert(Qmmp::URL, m_url);
             (qobject_cast<InputSource *>(parent()))->addMetaData(metaData);
+            (qobject_cast<InputSource *>(parent()))->addStreamInfo(m_stream.header);
         }
         emit ready();
     }
diff --git a/src/plugins/Transports/http/httpstreamreader.h b/src/plugins/Transports/http/httpstreamreader.h
index b9b84c160..488463902 100644
--- a/src/plugins/Transports/http/httpstreamreader.h
+++ b/src/plugins/Transports/http/httpstreamreader.h
@@ -25,7 +25,7 @@
 #include <QUrl>
 #include <QMutex>
 #include <QString>
-#include <QMap>
+#include <QHash>
 #include <QThread>
 #include <curl/curl.h>
 #ifdef WITH_ENCA
@@ -45,7 +45,7 @@ struct HttpStreamData
     long buf_fill;
     QString content_type;
     bool aborted;
-    QMap <QString, QString> header;
+    QHash <QString, QString> header;
     bool icy_meta_data;
     int icy_metaint;
 };