From 45117f6d2f2ccfb47af840d4416f43607d83d518 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Fri, 10 Oct 2008 08:42:15 +0000 Subject: cue sheet support git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@575 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Input/mad/decoder_mad.cpp | 2 +- src/plugins/Input/mad/decodermadfactory.cpp | 11 +++++++---- src/plugins/Input/mad/decodermadfactory.h | 3 ++- 3 files changed, 10 insertions(+), 6 deletions(-) (limited to 'src/plugins/Input/mad') diff --git a/src/plugins/Input/mad/decoder_mad.cpp b/src/plugins/Input/mad/decoder_mad.cpp index 0eeb912cf..74b7c124a 100644 --- a/src/plugins/Input/mad/decoder_mad.cpp +++ b/src/plugins/Input/mad/decoder_mad.cpp @@ -110,7 +110,7 @@ bool DecoderMAD::initialize() if (input()->isSequential ()) //for streams only { TagExtractor extractor(input()); - StateHandler::instance()->dispatch(extractor.id3v2tag()); + stateHandler()->dispatch(extractor.id3v2tag()); } mad_stream_init(&stream); diff --git a/src/plugins/Input/mad/decodermadfactory.cpp b/src/plugins/Input/mad/decodermadfactory.cpp index c41ab6fe9..ef8de8d45 100644 --- a/src/plugins/Input/mad/decodermadfactory.cpp +++ b/src/plugins/Input/mad/decodermadfactory.cpp @@ -99,11 +99,12 @@ Decoder *DecoderMADFactory::create(QObject *parent, QIODevice *input, Output *ou return new DecoderMAD(parent, this, input, output); } -FileInfo *DecoderMADFactory::createFileInfo(const QString &source) +//FileInfo *DecoderMADFactory::createFileInfo(const QString &source) +QList DecoderMADFactory::createPlayList(const QString &fileName) { - FileInfo *info = new FileInfo(); + FileInfo *info = new FileInfo(fileName); TagLib::Tag *tag = 0; - TagLib::MPEG::File fileRef(source.toLocal8Bit ()); + TagLib::MPEG::File fileRef(fileName.toLocal8Bit ()); QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat); settings.beginGroup("MAD"); @@ -183,7 +184,9 @@ FileInfo *DecoderMADFactory::createFileInfo(const QString &source) } if (fileRef.audioProperties()) info->setLength(fileRef.audioProperties()->length()); - return info; + QList list; + list << info; + return list; } QObject* DecoderMADFactory::showDetails(QWidget *parent, const QString &path) diff --git a/src/plugins/Input/mad/decodermadfactory.h b/src/plugins/Input/mad/decodermadfactory.h index b455f360e..a4d4d57ad 100644 --- a/src/plugins/Input/mad/decodermadfactory.h +++ b/src/plugins/Input/mad/decodermadfactory.h @@ -43,7 +43,8 @@ public: bool canDecode(QIODevice *input) const; const DecoderProperties properties() const; Decoder *create(QObject *, QIODevice *, Output *, const QString &); - FileInfo *createFileInfo(const QString &source); + //FileInfo *createFileInfo(const QString &source); + QList createPlayList(const QString &fileName); QObject* showDetails(QWidget *parent, const QString &path); void showSettings(QWidget *parent); void showAbout(QWidget *parent); -- cgit v1.2.3-13-gbd6f