fixed remaing plugins

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

4 files changed, 13 insertions, 12 deletions

diff --git a/src/plugins/Input/cue/cuemetadatamodel.cpp b/src/plugins/Input/cue/cuemetadatamodel.cpp
index d875ad993..366df20af 100644
--- a/src/plugins/Input/cue/cuemetadatamodel.cpp
+++ b/src/plugins/Input/cue/cuemetadatamodel.cpp
@@ -22,7 +22,7 @@
 #include "cueparser.h"
 #include "cuemetadatamodel.h"
 
-CUEMetaDataModel::CUEMetaDataModel(const QString &url, QObject *parent) : MetaDataModel(parent)
+CUEMetaDataModel::CUEMetaDataModel(const QString &url, QObject *parent) : MetaDataModel(true, parent)
 {
     m_parser = new CUEParser(url);
     if (m_parser->count() == 0)
@@ -39,19 +39,19 @@ CUEMetaDataModel::~CUEMetaDataModel()
     delete m_parser;
 }
 
-QHash<QString, QString> CUEMetaDataModel::audioProperties()
+QList<MetaDataItem> CUEMetaDataModel::extraProperties() const
 {
-    QHash <QString, QString> ap;
+    QList<MetaDataItem> ep;
     MetaDataModel *model = MetaDataManager::instance()->createMetaDataModel(m_path);
     if(model)
     {
-        ap = model->audioProperties();
-        model->deleteLater();
+        ep = model->extraProperties();
+        delete model;
     }
-    return ap;
+    return ep;
 }
 
-QString CUEMetaDataModel::coverPath()
+QString CUEMetaDataModel::coverPath() const
 {
     return MetaDataManager::instance()->findCoverFile(m_path);
 }
diff --git a/src/plugins/Input/cue/cuemetadatamodel.h b/src/plugins/Input/cue/cuemetadatamodel.h
index cb0af08d8..eb448be0d 100644
--- a/src/plugins/Input/cue/cuemetadatamodel.h
+++ b/src/plugins/Input/cue/cuemetadatamodel.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2009-2016 by Ilya Kotov                                 *
+ *   Copyright (C) 2009-2018 by Ilya Kotov                                 *
  *   forkotov02@ya.ru                                                      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -31,8 +31,8 @@ Q_OBJECT
 public:
     CUEMetaDataModel(const QString &url, QObject *parent);
     ~CUEMetaDataModel();
-    QHash<QString, QString> audioProperties();
-    QString coverPath();
+    QList<MetaDataItem> extraProperties() const override;
+    QString coverPath() const override;
 
 private:
     CUEParser *m_parser;
diff --git a/src/plugins/Input/cue/decodercuefactory.cpp b/src/plugins/Input/cue/decodercuefactory.cpp
index 285a4776d..e3a118cdf 100644
--- a/src/plugins/Input/cue/decodercuefactory.cpp
+++ b/src/plugins/Input/cue/decodercuefactory.cpp
@@ -74,8 +74,9 @@ QList<TrackInfo *> DecoderCUEFactory::createPlayList(const QString &path, TrackI
     }
 }
 
-MetaDataModel* DecoderCUEFactory::createMetaDataModel(const QString &path, QObject *parent)
+MetaDataModel* DecoderCUEFactory::createMetaDataModel(const QString &path, bool readOnly, QObject *parent)
 {
+    Q_UNUSED(readOnly);
     return path.startsWith("cue://") ? new CUEMetaDataModel(path, parent) : 0;
 }
 
diff --git a/src/plugins/Input/cue/decodercuefactory.h b/src/plugins/Input/cue/decodercuefactory.h
index 10969afc0..2610bfd99 100644
--- a/src/plugins/Input/cue/decodercuefactory.h
+++ b/src/plugins/Input/cue/decodercuefactory.h
@@ -35,7 +35,7 @@ public:
     DecoderProperties properties() const;
     Decoder *create(const QString &, QIODevice *);
     QList<TrackInfo *> createPlayList(const QString &path, TrackInfo::Parts parts, QStringList *ignoredPaths);
-    MetaDataModel* createMetaDataModel(const QString &path, QObject *parent = 0);
+    MetaDataModel* createMetaDataModel(const QString &path, bool readOnly = true, QObject *parent = 0);
     void showSettings(QWidget *parent);
     void showAbout(QWidget *parent);
     QString translation() const;