diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2009-09-23 12:40:02 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2009-09-23 12:40:02 +0000 |
| commit | e231bb9701639b20dd917865040b727af9b0b77e (patch) | |
| tree | 1430619af764fcdbe5b9053669e328217829b561 /src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp | |
| parent | 88dfdae1b1a839f2e66ccd6235c1ab812abfd4f1 (diff) | |
| download | qmmp-e231bb9701639b20dd917865040b727af9b0b77e.tar.gz qmmp-e231bb9701639b20dd917865040b727af9b0b77e.tar.bz2 qmmp-e231bb9701639b20dd917865040b727af9b0b77e.zip | |
ported ffmpeg plugin (Closes issue 170)
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1254 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp')
| -rw-r--r-- | src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp index f8ddb4733..77d556108 100644 --- a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp +++ b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp @@ -41,7 +41,7 @@ extern "C" #endif } -#include "detailsdialog.h" +#include "ffmpegmetadatamodel.h" #include "settingsdialog.h" #include "decoder_ffmpeg.h" #include "decoderffmpegfactory.h" @@ -92,11 +92,10 @@ const DecoderProperties DecoderFFmpegFactory::properties() const return properties; } -Decoder *DecoderFFmpegFactory::create(QObject *parent, QIODevice *input, - Output *output, const QString &path) +Decoder *DecoderFFmpegFactory::create(const QString &path, QIODevice *input) { Q_UNUSED(input); - return new DecoderFFmpeg(parent, this, output, path); + return new DecoderFFmpeg(path); } QList<FileInfo *> DecoderFFmpegFactory::createPlayList(const QString &fileName, bool useMetaData) @@ -131,11 +130,9 @@ QList<FileInfo *> DecoderFFmpegFactory::createPlayList(const QString &fileName, return list; } -QObject* DecoderFFmpegFactory::showDetails(QWidget *parent, const QString &path) +MetaDataModel* DecoderFFmpegFactory::createMetaDataModel(const QString &path, QObject *parent) { - DetailsDialog *d = new DetailsDialog(parent, path); - d -> show(); - return d; + return new FFmpegMetaDataModel(path,parent); } void DecoderFFmpegFactory::showSettings(QWidget *parent) |
