From 234d9ee71a9ed4ed9af8f9f7d384e7a13333ad96 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Wed, 30 May 2018 18:38:19 +0000 Subject: enabled sid plugin git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@7978 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Input/Input.pro | 2 +- src/plugins/Input/sid/decoder_sid.cpp | 1 - src/plugins/Input/sid/decodersidfactory.cpp | 16 ++++++++-------- src/plugins/Input/sid/decodersidfactory.h | 12 +++--------- src/plugins/Input/sid/sidhelper.cpp | 20 ++++++++++---------- src/plugins/Input/sid/sidhelper.h | 6 +++--- 6 files changed, 25 insertions(+), 32 deletions(-) diff --git a/src/plugins/Input/Input.pro b/src/plugins/Input/Input.pro index f0c701b2b..5cb98cdf5 100644 --- a/src/plugins/Input/Input.pro +++ b/src/plugins/Input/Input.pro @@ -36,7 +36,7 @@ contains(CONFIG, CDAUDIO_PLUGIN){ } contains(CONFIG, SID_PLUGIN){ - #SUBDIRS += sid + SUBDIRS += sid } unix{ diff --git a/src/plugins/Input/sid/decoder_sid.cpp b/src/plugins/Input/sid/decoder_sid.cpp index 289e969c7..6fa67f577 100644 --- a/src/plugins/Input/sid/decoder_sid.cpp +++ b/src/plugins/Input/sid/decoder_sid.cpp @@ -85,7 +85,6 @@ bool DecoderSID::initialize() metadata.insert(Qmmp::ARTIST, tune_info->infoString(1)); metadata.insert(Qmmp::COMMENT, tune_info->commentString(0)); metadata.insert(Qmmp::TRACK, QString("%1").arg(track)); - metadata.insert(Qmmp::URL, m_url); addMetaData(metadata); //read settings diff --git a/src/plugins/Input/sid/decodersidfactory.cpp b/src/plugins/Input/sid/decodersidfactory.cpp index bf1579669..8a135429b 100644 --- a/src/plugins/Input/sid/decodersidfactory.cpp +++ b/src/plugins/Input/sid/decodersidfactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2013-2016 by Ilya Kotov * + * Copyright (C) 2013-2018 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -74,25 +74,25 @@ Decoder *DecoderSIDFactory::create(const QString &path, QIODevice *input) return new DecoderSID(&m_db, path); } -QList DecoderSIDFactory::createPlayList(const QString &fileName, bool useMetaData, QStringList *) +QList DecoderSIDFactory::createPlayList(const QString &path, TrackInfo::Parts parts, QStringList *) { SIDHelper helper(&m_db); - helper.load(fileName); - QList list = helper.createPlayList(useMetaData); + helper.load(path); + QList list = helper.createPlayList(parts); if(list.isEmpty()) return list; - if(fileName.contains("://")) //is it url? + if(path.contains("://")) //is it url? { - int track = fileName.section("#", -1).toInt(); + int track = path.section("#", -1).toInt(); if(track > list.count() || track < 1) { qDeleteAll(list); list.clear(); return list; } - FileInfo *info = list.takeAt(track - 1); + TrackInfo *info = list.takeAt(track - 1); qDeleteAll(list); - return QList() << info; + return QList() << info; } return list; } diff --git a/src/plugins/Input/sid/decodersidfactory.h b/src/plugins/Input/sid/decodersidfactory.h index bf8b03ebe..1fa556770 100644 --- a/src/plugins/Input/sid/decodersidfactory.h +++ b/src/plugins/Input/sid/decodersidfactory.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2013-2016 by Ilya Kotov * + * Copyright (C) 2013-2018 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -20,15 +20,9 @@ #ifndef DECODERSIDFACTORY_H #define DECODERSIDFACTORY_H -#include -#include -#include -#include #include -#include -#include #include -#include + /** @author Ilya Kotov @@ -45,7 +39,7 @@ public: bool canDecode(QIODevice *input) const; const DecoderProperties properties() const; Decoder *create(const QString &path, QIODevice *input); - QList createPlayList(const QString &fileName, bool useMetaData, QStringList *); + QList createPlayList(const QString &path, TrackInfo::Parts parts, QStringList *); MetaDataModel* createMetaDataModel(const QString &path, QObject *parent = 0); void showSettings(QWidget *parent); void showAbout(QWidget *parent); diff --git a/src/plugins/Input/sid/sidhelper.cpp b/src/plugins/Input/sid/sidhelper.cpp index e59f05724..999edcbcf 100644 --- a/src/plugins/Input/sid/sidhelper.cpp +++ b/src/plugins/Input/sid/sidhelper.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2013 by Ilya Kotov * + * Copyright (C) 2013-2018 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -56,9 +56,9 @@ SidTune *SIDHelper::load(const QString &url) return m_tune; } -QList SIDHelper::createPlayList(bool meta) +QList SIDHelper::createPlayList(TrackInfo::Parts parts) { - QList list; + QList list; if(!m_tune || !m_tune->getInfo()) return list; int count = m_tune->getInfo()->songs(); @@ -69,19 +69,19 @@ QList SIDHelper::createPlayList(bool meta) for(int i = 1; i <= count; ++i) { m_tune->selectSong(i+1); - FileInfo *info = new FileInfo(); + TrackInfo *info = new TrackInfo(); - if(meta) + if(parts & TrackInfo::MetaData) { const SidTuneInfo *tune_info = m_tune->getInfo(); - info->setMetaData(Qmmp::TITLE, tune_info->infoString(0)); - info->setMetaData(Qmmp::ARTIST, tune_info->infoString(1)); - info->setMetaData(Qmmp::COMMENT, tune_info->commentString(0)); - info->setMetaData(Qmmp::TRACK, i); + info->setValue(Qmmp::TITLE, tune_info->infoString(0)); + info->setValue(Qmmp::ARTIST, tune_info->infoString(1)); + info->setValue(Qmmp::COMMENT, tune_info->commentString(0)); + info->setValue(Qmmp::TRACK, i); } int length = m_db->length(md5, i); if(length > -1) - info->setLength(length); + info->setDuration(length * 1000); info->setPath("sid://" + m_path + QString("#%1").arg(i)); list << info; diff --git a/src/plugins/Input/sid/sidhelper.h b/src/plugins/Input/sid/sidhelper.h index b66f6aa0b..4e9d41c9f 100644 --- a/src/plugins/Input/sid/sidhelper.h +++ b/src/plugins/Input/sid/sidhelper.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2013 by Ilya Kotov * + * Copyright (C) 2013-2018 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -26,7 +26,7 @@ #include #include #include -#include +#include /** @author Ilya Kotov @@ -37,7 +37,7 @@ public: SIDHelper(SidDatabase *db); ~SIDHelper(); SidTune *load(const QString &url); - QList createPlayList(bool meta); + QList createPlayList(TrackInfo::Parts parts); private: QString m_path; -- cgit v1.2.3-13-gbd6f