aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/plugins/Input/Input.pro2
-rw-r--r--src/plugins/Input/sid/decoder_sid.cpp1
-rw-r--r--src/plugins/Input/sid/decodersidfactory.cpp16
-rw-r--r--src/plugins/Input/sid/decodersidfactory.h12
-rw-r--r--src/plugins/Input/sid/sidhelper.cpp20
-rw-r--r--src/plugins/Input/sid/sidhelper.h6
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<FileInfo *> DecoderSIDFactory::createPlayList(const QString &fileName, bool useMetaData, QStringList *)
+QList<TrackInfo *> DecoderSIDFactory::createPlayList(const QString &path, TrackInfo::Parts parts, QStringList *)
{
SIDHelper helper(&m_db);
- helper.load(fileName);
- QList <FileInfo*> list = helper.createPlayList(useMetaData);
+ helper.load(path);
+ QList<TrackInfo*> 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<FileInfo *>() << info;
+ return QList<TrackInfo *>() << 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 <QObject>
-#include <QString>
-#include <QIODevice>
-#include <QWidget>
#include <sidplayfp/SidDatabase.h>
-#include <qmmp/decoder.h>
-#include <qmmp/output.h>
#include <qmmp/decoderfactory.h>
-#include <qmmp/fileinfo.h>
+
/**
@author Ilya Kotov <forkotov02@ya.ru>
@@ -45,7 +39,7 @@ public:
bool canDecode(QIODevice *input) const;
const DecoderProperties properties() const;
Decoder *create(const QString &path, QIODevice *input);
- QList<FileInfo *> createPlayList(const QString &fileName, bool useMetaData, QStringList *);
+ QList<TrackInfo *> 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 <FileInfo*> SIDHelper::createPlayList(bool meta)
+QList<TrackInfo *> SIDHelper::createPlayList(TrackInfo::Parts parts)
{
- QList <FileInfo*> list;
+ QList<TrackInfo *> list;
if(!m_tune || !m_tune->getInfo())
return list;
int count = m_tune->getInfo()->songs();
@@ -69,19 +69,19 @@ QList <FileInfo*> 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 <sidplayfp/SidTune.h>
#include <sidplayfp/SidTuneInfo.h>
#include <sidplayfp/SidDatabase.h>
-#include <qmmp/fileinfo.h>
+#include <qmmp/trackinfo.h>
/**
@author Ilya Kotov <forkotov02@ya.ru>
@@ -37,7 +37,7 @@ public:
SIDHelper(SidDatabase *db);
~SIDHelper();
SidTune *load(const QString &url);
- QList <FileInfo*> createPlayList(bool meta);
+ QList<TrackInfo *> createPlayList(TrackInfo::Parts parts);
private:
QString m_path;
generated by cgit v1.2.3-13-gbd6f (git 2.30.0) at 2025-12-15 21:59:38 +0000