From 9bdd208bbb16ec15d52653a9913789b44b3b28b3 Mon Sep 17 00:00:00 2001
From: trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>
Date: Wed, 2 May 2018 10:16:40 +0000
Subject: removed Qmmp::URL

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@7943 90c681e8-e032-0410-971d-27865f9a5e38
---
 src/plugins/Effect/filewriter/filewriterplugin.cpp | 16 ++++++++--------
 src/plugins/Effect/filewriter/filewriterplugin.h   |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/plugins/Effect/filewriter')

diff --git a/src/plugins/Effect/filewriter/filewriterplugin.cpp b/src/plugins/Effect/filewriter/filewriterplugin.cpp
index f7646d0a4..ecc0d1ba7 100644
--- a/src/plugins/Effect/filewriter/filewriterplugin.cpp
+++ b/src/plugins/Effect/filewriter/filewriterplugin.cpp
@@ -40,13 +40,13 @@ void FileWriterPlugin::configure(quint32 srate, ChannelMap map)
 {
     Effect::configure(srate, map);
     if(SoundCore::instance()->state() == Qmmp::Playing ||  SoundCore::instance()->state() == Qmmp::Paused)
-        init(SoundCore::instance()->metaData());
+        init(SoundCore::instance()->trackInfo());
 }
 
 void FileWriterPlugin::applyEffect(Buffer *b)
 {
-    if(!b->metaData.isNull())
-        init(*b->metaData);
+    if(!b->trackInfo.isNull())
+        init(*b->trackInfo);
 
     if(!m_inited || !b->samples)
         return;
@@ -110,7 +110,7 @@ void FileWriterPlugin::applyEffect(Buffer *b)
     }
 }
 
-void FileWriterPlugin::init(const QMap<Qmmp::MetaData, QString> &metaData)
+void FileWriterPlugin::init(const TrackInfo &info)
 {
     deinit();
 
@@ -120,10 +120,10 @@ void FileWriterPlugin::init(const QMap<Qmmp::MetaData, QString> &metaData)
     outDir = settings.value("FileWriter/out_dir", outDir).toString();
     QString fileName = settings.value("FileWriter/file_name", "%p%if(%p&%t, - ,)%t").toString();
     if(fileName.isEmpty())
-        fileName = metaData[Qmmp::URL].section("/", 1);
+        fileName = info.path().section("/", 1);
 
     MetaDataFormatter formatter(fileName);
-    fileName = formatter.format(metaData, SoundCore::instance()->duration());
+    fileName = formatter.format(&info);
     if(!fileName.endsWith(".ogg", Qt::CaseInsensitive))
         fileName.append(".ogg");
 
@@ -173,8 +173,8 @@ void FileWriterPlugin::init(const QMap<Qmmp::MetaData, QString> &metaData)
     int i = 0;
     while(tag_map[i].key != Qmmp::UNKNOWN)
     {
-        if(!metaData[tag_map[i].key].isEmpty())
-            vorbis_comment_add_tag(&m_vc, tag_map[i].tag, metaData.value(tag_map[i].key).toUtf8().constData());
+        if(!info.value(tag_map[i].key).isEmpty())
+            vorbis_comment_add_tag(&m_vc, tag_map[i].tag, info.value(tag_map[i].key).toUtf8().constData());
         i++;
     }
 
diff --git a/src/plugins/Effect/filewriter/filewriterplugin.h b/src/plugins/Effect/filewriter/filewriterplugin.h
index ebf0c6f39..1ec1174bd 100644
--- a/src/plugins/Effect/filewriter/filewriterplugin.h
+++ b/src/plugins/Effect/filewriter/filewriterplugin.h
@@ -37,7 +37,7 @@ public:
     void applyEffect(Buffer *b);
 
 private:
-    void init(const QMap<Qmmp::MetaData, QString> &metaData);
+    void init(const TrackInfo &info);
     void deinit();
     void sendHeader();
 
-- 
cgit v1.2.3-13-gbd6f