diff options
Diffstat (limited to 'src/plugins/Input/cue')
| -rw-r--r-- | src/plugins/Input/cue/cuemetadatamodel.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/Input/cue/cueparser.cpp | 9 | ||||
| -rw-r--r-- | src/plugins/Input/cue/cueparser.h | 4 | ||||
| -rw-r--r-- | src/plugins/Input/cue/decoder_cue.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/Input/cue/decodercuefactory.cpp | 3 |
5 files changed, 10 insertions, 10 deletions
diff --git a/src/plugins/Input/cue/cuemetadatamodel.cpp b/src/plugins/Input/cue/cuemetadatamodel.cpp index 4043a955c..d875ad993 100644 --- a/src/plugins/Input/cue/cuemetadatamodel.cpp +++ b/src/plugins/Input/cue/cuemetadatamodel.cpp @@ -24,7 +24,7 @@ CUEMetaDataModel::CUEMetaDataModel(const QString &url, QObject *parent) : MetaDataModel(parent) { - m_parser = new CUEParser(url, TrackInfo::AllParts); + m_parser = new CUEParser(url); if (m_parser->count() == 0) { qWarning("CUEMetaDataModel: invalid cue file"); diff --git a/src/plugins/Input/cue/cueparser.cpp b/src/plugins/Input/cue/cueparser.cpp index b3b393c87..350d6f76e 100644 --- a/src/plugins/Input/cue/cueparser.cpp +++ b/src/plugins/Input/cue/cueparser.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2017 by Ilya Kotov * + * Copyright (C) 2008-2018 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -31,7 +31,7 @@ #endif #include "cueparser.h" -CUEParser::CUEParser(const QString &path, TrackInfo::Parts parts) +CUEParser::CUEParser(const QString &path) { QString fileName = path; if(path.contains("://")) @@ -179,13 +179,12 @@ CUEParser::CUEParser(const QString &path, TrackInfo::Parts parts) if(i == 0 || m_tracks[i - 1]->file != m_tracks[i]->file) { qDeleteAll(f_list); - f_list = MetaDataManager::instance()->createPlayList(m_tracks[i]->file, (parts & TrackInfo::Properties) - ? TrackInfo::NoParts : TrackInfo::Properties); + f_list = MetaDataManager::instance()->createPlayList(m_tracks[i]->file, TrackInfo::Properties); } if(!f_list.isEmpty()) m_tracks[i]->info.setValues(f_list.first()->properties()); - if((i < m_tracks.count() - 1) && ( m_tracks[i]->file == m_tracks[i+1]->file)) + if((i < m_tracks.count() - 1) && (m_tracks[i]->file == m_tracks[i+1]->file)) m_tracks[i]->info.setDuration(m_tracks[i+1]->offset - m_tracks[i]->offset); else if(!f_list.isEmpty()) m_tracks[i]->info.setDuration(qMax(0LL, f_list.first()->duration() - m_tracks[i]->offset)); diff --git a/src/plugins/Input/cue/cueparser.h b/src/plugins/Input/cue/cueparser.h index 88d9b452b..5c0d24c8a 100644 --- a/src/plugins/Input/cue/cueparser.h +++ b/src/plugins/Input/cue/cueparser.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2015 by Ilya Kotov * + * Copyright (C) 2008-2018 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -34,7 +34,7 @@ class CUEParser { public: - CUEParser(const QString &path, TrackInfo::Parts parts); + CUEParser(const QString &path); ~CUEParser(); diff --git a/src/plugins/Input/cue/decoder_cue.cpp b/src/plugins/Input/cue/decoder_cue.cpp index 2ba4626e5..e21dfdca5 100644 --- a/src/plugins/Input/cue/decoder_cue.cpp +++ b/src/plugins/Input/cue/decoder_cue.cpp @@ -58,7 +58,7 @@ DecoderCUE::~DecoderCUE() bool DecoderCUE::initialize() { - m_parser = new CUEParser(m_path, TrackInfo::MetaData); + m_parser = new CUEParser(m_path); if (m_parser->count() == 0) { qWarning("DecoderCUE: invalid cue file"); diff --git a/src/plugins/Input/cue/decodercuefactory.cpp b/src/plugins/Input/cue/decodercuefactory.cpp index 1997e24c4..e9e63c02b 100644 --- a/src/plugins/Input/cue/decodercuefactory.cpp +++ b/src/plugins/Input/cue/decodercuefactory.cpp @@ -55,7 +55,8 @@ Decoder *DecoderCUEFactory::create(const QString &path, QIODevice *input) QList<TrackInfo *> DecoderCUEFactory::createPlayList(const QString &path, TrackInfo::Parts parts, QStringList *ignoredPaths) { - CUEParser parser(path, parts); + Q_UNUSED(parts); + CUEParser parser(path); if(path.contains("://")) { QList<TrackInfo *> list; |