From 9b80a143f0ba56ba50a0108c94f005df62cbeade Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Wed, 30 May 2018 17:39:42 +0000 Subject: enabled gme plugin git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@7975 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Input/gme/decodergmefactory.cpp | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) (limited to 'src/plugins/Input/gme/decodergmefactory.cpp') diff --git a/src/plugins/Input/gme/decodergmefactory.cpp b/src/plugins/Input/gme/decodergmefactory.cpp index 4b9050dee..a7c8d931a 100644 --- a/src/plugins/Input/gme/decodergmefactory.cpp +++ b/src/plugins/Input/gme/decodergmefactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2010-2017 by Ilya Kotov * + * Copyright (C) 2010-2018 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -55,37 +55,35 @@ Decoder *DecoderGmeFactory::create(const QString &path, QIODevice *input) return new DecoderGme(path); } -QList DecoderGmeFactory::createPlayList(const QString &fileName, bool useMetaData, QStringList *ignoredFiles) +QList DecoderGmeFactory::createPlayList(const QString &path, TrackInfo::Parts parts, QStringList *ignoredFiles) { - QList list; GmeHelper helper; //is it one track? - if(fileName.contains("://")) + if(path.contains("://")) { - QString path = fileName; - path.remove("gme://"); - path.remove(QRegExp("#\\d+$")); - int track = fileName.section("#", -1).toInt(); - list = createPlayList(path, true, ignoredFiles); + QString filePath = path; + filePath.remove("gme://"); + filePath.remove(QRegExp("#\\d+$")); + int track = path.section("#", -1).toInt(); + QList list = createPlayList(filePath, parts, ignoredFiles); if (list.isEmpty() || track <= 0 || track > list.count()) { 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; } - Music_Emu *emu = helper.load(fileName); + Music_Emu *emu = helper.load(path); if(!emu) { qWarning("DecoderGmeFactory: unable to open file"); - return list; + return QList(); } - list = helper.createPlayList(useMetaData); - return list; + return helper.createPlayList(parts); } MetaDataModel* DecoderGmeFactory::createMetaDataModel(const QString &path, QObject *parent) -- cgit v1.2.3-13-gbd6f