fixed vorbis stream metadata

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

3 files changed, 6 insertions, 4 deletions

diff --git a/src/plugins/Input/vorbis/decoder_vorbis.cpp b/src/plugins/Input/vorbis/decoder_vorbis.cpp
index d07ee413a..7b8c1e480 100644
--- a/src/plugins/Input/vorbis/decoder_vorbis.cpp
+++ b/src/plugins/Input/vorbis/decoder_vorbis.cpp
@@ -69,7 +69,7 @@ static long oggtell(void *src)
 
 // Decoder class
 
-DecoderVorbis::DecoderVorbis(QIODevice *i)
+DecoderVorbis::DecoderVorbis(const QString &url, QIODevice *i)
         : Decoder(i)
 {
     inited = FALSE;
@@ -77,6 +77,7 @@ DecoderVorbis::DecoderVorbis(QIODevice *i)
     m_section = 0;
     m_last_section = -1;
     m_bitrate = 0;
+    m_url = url;
 }
 
 
@@ -212,8 +213,8 @@ void DecoderVorbis::updateTags()
                               "discnumber=", strlen ("discnumber=")))
             metaData.insert(Qmmp::DISCNUMBER, QString::number(atoi(comments->user_comments[i]
                             + strlen ("discnumber="))));
-
     }
+    metaData.insert(Qmmp::URL, m_url);
     StateHandler::instance()->dispatch(metaData);
 }
 
diff --git a/src/plugins/Input/vorbis/decoder_vorbis.h b/src/plugins/Input/vorbis/decoder_vorbis.h
index e9b33d60c..c968379d5 100644
--- a/src/plugins/Input/vorbis/decoder_vorbis.h
+++ b/src/plugins/Input/vorbis/decoder_vorbis.h
@@ -15,7 +15,7 @@
 class DecoderVorbis : public Decoder
 {
 public:
-    DecoderVorbis(QIODevice *i);
+    DecoderVorbis(const QString &url, QIODevice *i);
     virtual ~DecoderVorbis();
 
     // Standard Decoder API
@@ -38,6 +38,7 @@ private:
     int m_section, m_last_section;
     int m_bitrate;
     bool inited;
+    QString m_url;
 };
 
 
diff --git a/src/plugins/Input/vorbis/decodervorbisfactory.cpp b/src/plugins/Input/vorbis/decodervorbisfactory.cpp
index ad4ff844c..6326a92f7 100644
--- a/src/plugins/Input/vorbis/decodervorbisfactory.cpp
+++ b/src/plugins/Input/vorbis/decodervorbisfactory.cpp
@@ -60,7 +60,7 @@ const DecoderProperties DecoderVorbisFactory::properties() const
 
 Decoder *DecoderVorbisFactory::create(const QString &url, QIODevice *input)
 {
-    Decoder *d = new DecoderVorbis(input);
+    Decoder *d = new DecoderVorbis(url, input);
     if(!url.contains("://")) //local file
     {
         ReplayGainReader rg(url);