From 5dc0158eea0d4ff35e5d02b03b1e54d4aa838941 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Tue, 29 Sep 2009 14:36:38 +0000 Subject: enabled modplug support git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1268 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Input/modplug/decodermodplugfactory.cpp | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'src/plugins/Input/modplug/decodermodplugfactory.cpp') diff --git a/src/plugins/Input/modplug/decodermodplugfactory.cpp b/src/plugins/Input/modplug/decodermodplugfactory.cpp index dc913e654..fdef9d3ad 100644 --- a/src/plugins/Input/modplug/decodermodplugfactory.cpp +++ b/src/plugins/Input/modplug/decodermodplugfactory.cpp @@ -26,7 +26,7 @@ #include #include "settingsdialog.h" -#include "detailsdialog.h" +#include "modplugmetadatamodel.h" #include "decoder_modplug.h" #include "archivereader.h" #include "decodermodplugfactory.h" @@ -71,11 +71,10 @@ const DecoderProperties DecoderModPlugFactory::properties() const return properties; } -Decoder *DecoderModPlugFactory::create(QObject *parent, QIODevice *input, - Output *output, const QString &path) +Decoder *DecoderModPlugFactory::create(const QString &path, QIODevice *input) { Q_UNUSED(input); - return new DecoderModPlug(parent, this, output, path); + return new DecoderModPlug(path); } QList DecoderModPlugFactory::createPlayList(const QString &fileName, bool useMetaData) @@ -106,7 +105,7 @@ QList DecoderModPlugFactory::createPlayList(const QString &fileName, file.close(); } CSoundFile* soundFile = new CSoundFile(); - soundFile->Create((uchar*) buffer.data(), buffer.size()); + soundFile->Create((uchar*) buffer.data(), buffer.size()+1); list << new FileInfo(fileName); list.at(0)->setLength((int) soundFile->GetSongTime()); list.at(0)->setMetaData(Qmmp::TITLE, QString::fromUtf8(soundFile->GetTitle())); @@ -115,11 +114,9 @@ QList DecoderModPlugFactory::createPlayList(const QString &fileName, return list; } -QObject* DecoderModPlugFactory::showDetails(QWidget *parent, const QString &path) +MetaDataModel* DecoderModPlugFactory::createMetaDataModel(const QString &path, QObject *parent) { - DetailsDialog *d = new DetailsDialog(parent, path); - d -> show(); - return d; + return new ModPlugMetaDataModel(path, parent); } void DecoderModPlugFactory::showSettings(QWidget *parent) -- cgit v1.2.3-13-gbd6f