diff options
Diffstat (limited to 'src/plugins/Input/ffmpeg')
4 files changed, 5 insertions, 6 deletions
diff --git a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp index b40a558c8..e82e39900 100644 --- a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp +++ b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp @@ -237,10 +237,10 @@ QList<TrackInfo *> DecoderFFmpegFactory::createPlayList(const QString &path, Tra return QList<TrackInfo*>() << info; } -MetaDataModel* DecoderFFmpegFactory::createMetaDataModel(const QString &path, bool readOnly, QObject *parent) +MetaDataModel* DecoderFFmpegFactory::createMetaDataModel(const QString &path, bool readOnly) { Q_UNUSED(readOnly); - return new FFmpegMetaDataModel(path, parent); + return new FFmpegMetaDataModel(path); } void DecoderFFmpegFactory::showSettings(QWidget *parent) diff --git a/src/plugins/Input/ffmpeg/decoderffmpegfactory.h b/src/plugins/Input/ffmpeg/decoderffmpegfactory.h index 3a77deefa..60112ec2f 100644 --- a/src/plugins/Input/ffmpeg/decoderffmpegfactory.h +++ b/src/plugins/Input/ffmpeg/decoderffmpegfactory.h @@ -35,7 +35,7 @@ public: DecoderProperties properties() const; Decoder *create(const QString &, QIODevice *); QList<TrackInfo *> createPlayList(const QString &path, TrackInfo::Parts parts, QStringList *); - MetaDataModel* createMetaDataModel(const QString &path, bool readOnly, QObject *parent = 0); + MetaDataModel* createMetaDataModel(const QString &path, bool readOnly); void showSettings(QWidget *parent); void showAbout(QWidget *parent); QString translation() const; diff --git a/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp b/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp index 14feeaf03..d3b725744 100644 --- a/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp +++ b/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.cpp @@ -21,7 +21,7 @@ #include <stdint.h> #include "ffmpegmetadatamodel.h" -FFmpegMetaDataModel::FFmpegMetaDataModel(const QString &path, QObject *parent) : MetaDataModel(true, parent) +FFmpegMetaDataModel::FFmpegMetaDataModel(const QString &path) : MetaDataModel(true) { m_in = 0; #ifdef Q_OS_WIN diff --git a/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.h b/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.h index f41f89d47..32f521e62 100644 --- a/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.h +++ b/src/plugins/Input/ffmpeg/ffmpegmetadatamodel.h @@ -33,9 +33,8 @@ extern "C"{ class FFmpegMetaDataModel : public MetaDataModel { -Q_OBJECT public: - FFmpegMetaDataModel(const QString &path, QObject *parent); + FFmpegMetaDataModel(const QString &path); ~FFmpegMetaDataModel(); QPixmap cover() const; |