diff options
Diffstat (limited to 'src/plugins/Input/modplug')
4 files changed, 21 insertions, 27 deletions
diff --git a/src/plugins/Input/modplug/decodermodplugfactory.cpp b/src/plugins/Input/modplug/decodermodplugfactory.cpp index 2142f8179..89ba9ba4e 100644 --- a/src/plugins/Input/modplug/decodermodplugfactory.cpp +++ b/src/plugins/Input/modplug/decodermodplugfactory.cpp @@ -119,8 +119,9 @@ QList<TrackInfo *> DecoderModPlugFactory::createPlayList(const QString &path, Tr return list; } -MetaDataModel* DecoderModPlugFactory::createMetaDataModel(const QString &path, QObject *parent) +MetaDataModel* DecoderModPlugFactory::createMetaDataModel(const QString &path, bool readOnly, QObject *parent) { + Q_UNUSED(readOnly); return new ModPlugMetaDataModel(path, parent); } diff --git a/src/plugins/Input/modplug/decodermodplugfactory.h b/src/plugins/Input/modplug/decodermodplugfactory.h index bd7acab5f..0108c2c31 100644 --- a/src/plugins/Input/modplug/decodermodplugfactory.h +++ b/src/plugins/Input/modplug/decodermodplugfactory.h @@ -33,7 +33,7 @@ public: DecoderProperties properties() const; Decoder *create(const QString &, QIODevice *); QList<TrackInfo *> createPlayList(const QString &path, TrackInfo::Parts parts, QStringList *); - MetaDataModel* createMetaDataModel(const QString &path, QObject *parent = 0); + MetaDataModel* createMetaDataModel(const QString &path, bool readOnly, QObject *parent = 0); void showSettings(QWidget *parent); void showAbout(QWidget *parent); QString translation() const; diff --git a/src/plugins/Input/modplug/modplugmetadatamodel.cpp b/src/plugins/Input/modplug/modplugmetadatamodel.cpp index fded36966..cd1636ea3 100644 --- a/src/plugins/Input/modplug/modplugmetadatamodel.cpp +++ b/src/plugins/Input/modplug/modplugmetadatamodel.cpp @@ -29,7 +29,7 @@ #define MAX_MESSAGE_LENGTH 4000 -ModPlugMetaDataModel::ModPlugMetaDataModel(const QString &path, QObject *parent) : MetaDataModel(parent) +ModPlugMetaDataModel::ModPlugMetaDataModel(const QString &path, QObject *parent) : MetaDataModel(true, parent) { m_soundFile = 0; m_path = path; @@ -62,31 +62,24 @@ ModPlugMetaDataModel::~ModPlugMetaDataModel() } } -QHash<QString, QString> ModPlugMetaDataModel::audioProperties() +QList<MetaDataItem> ModPlugMetaDataModel::extraProperties() const { - QHash<QString, QString> ap; + QList<MetaDataItem> ep; if(!m_soundFile) - return ap; + return ep; - ap.insert(tr("File name"), m_path.section('/',-1)); - QString text = getTypeName(m_soundFile->GetType()); - ap.insert(tr("Type"), text); - int lSongTime = m_soundFile->GetSongTime(); - text = QString("%1").arg(lSongTime/60); - text +=":"+QString("%1").arg(lSongTime%60,2,10,QChar('0')); - ap.insert(tr("Length"), text); - ap.insert(tr("Speed"), QString::number(m_soundFile->GetMusicSpeed())); - ap.insert(tr("Tempo"), QString::number(m_soundFile->GetMusicTempo())); - ap.insert(tr("Samples"), QString::number(m_soundFile->GetNumSamples())); - ap.insert(tr("Instruments"), QString::number(m_soundFile->GetNumInstruments())); - ap.insert(tr("Patterns"), QString::number(m_soundFile->GetNumPatterns())); - ap.insert(tr("Channels"), QString::number(m_soundFile->GetNumChannels())); - return ap; + ep << MetaDataItem(tr("Speed"), m_soundFile->GetMusicSpeed()); + ep << MetaDataItem(tr("Tempo"), m_soundFile->GetMusicTempo()); + ep << MetaDataItem(tr("Samples"), m_soundFile->GetNumSamples()); + ep << MetaDataItem(tr("Instruments"), m_soundFile->GetNumInstruments()); + ep << MetaDataItem(tr("Patterns"), m_soundFile->GetNumPatterns()); + ep << MetaDataItem(tr("Channels"), m_soundFile->GetNumChannels()); + return ep; } -QHash<QString, QString> ModPlugMetaDataModel::descriptions() +QList<MetaDataItem> ModPlugMetaDataModel::descriptions() const { - QHash<QString, QString> desc; + QList<MetaDataItem> desc; if(!m_soundFile) return desc; char lBuffer[33]; @@ -98,7 +91,7 @@ QHash<QString, QString> ModPlugMetaDataModel::descriptions() } text = text.trimmed(); if(!text.isEmpty()) - desc.insert(tr("Samples"), text); + desc << MetaDataItem(tr("Samples"), text); text.clear(); for(uint i = 0; i < m_soundFile->GetNumInstruments(); i++) { @@ -107,12 +100,12 @@ QHash<QString, QString> ModPlugMetaDataModel::descriptions() } text = text.trimmed(); if(!text.isEmpty()) - desc.insert(tr("Instruments"), text); + desc << MetaDataItem(tr("Instruments"), text); text.clear(); char message[MAX_MESSAGE_LENGTH]; int length = m_soundFile->GetSongComments(message, MAX_MESSAGE_LENGTH, 80); if (length != 0) - desc.insert(tr("Comment"), QString::fromUtf8(message).trimmed ()); + desc << MetaDataItem(tr("Comment"), QString::fromUtf8(message).trimmed ()); return desc; } diff --git a/src/plugins/Input/modplug/modplugmetadatamodel.h b/src/plugins/Input/modplug/modplugmetadatamodel.h index d20306480..544155a12 100644 --- a/src/plugins/Input/modplug/modplugmetadatamodel.h +++ b/src/plugins/Input/modplug/modplugmetadatamodel.h @@ -32,8 +32,8 @@ Q_OBJECT public: ModPlugMetaDataModel(const QString &path, QObject *parent); ~ModPlugMetaDataModel(); - QHash<QString, QString> audioProperties(); - QHash<QString, QString> descriptions(); + QList<MetaDataItem> extraProperties() const override; + QList<MetaDataItem> descriptions() const override; static QString getTypeName(quint32 type); private: |