diff options
Diffstat (limited to 'src/plugins')
7 files changed, 6 insertions, 12 deletions
diff --git a/src/plugins/Engines/mplayer/mplayerengine.cpp b/src/plugins/Engines/mplayer/mplayerengine.cpp index 33a2c69ae..bf315c2eb 100644 --- a/src/plugins/Engines/mplayer/mplayerengine.cpp +++ b/src/plugins/Engines/mplayer/mplayerengine.cpp @@ -23,16 +23,11 @@ #include <QFile> #include <QApplication> #include <QAction> -#include <QMetaObject> #include <QKeyEvent> #include <QMenu> #include <QRegExp> #include <QSettings> -#include <qmmp/buffer.h> -#include <qmmp/output.h> -#include <qmmp/recycler.h> #include <qmmp/fileinfo.h> -#include <qmmp/decoderfactory.h> #include <qmmp/inputsource.h> #include "mplayerengine.h" diff --git a/src/plugins/Engines/mplayer/mplayerenginefactory.cpp b/src/plugins/Engines/mplayer/mplayerenginefactory.cpp index 33ca2e4cf..8dbe80960 100644 --- a/src/plugins/Engines/mplayer/mplayerenginefactory.cpp +++ b/src/plugins/Engines/mplayer/mplayerenginefactory.cpp @@ -93,4 +93,4 @@ QTranslator *MplayerEngineFactory::createTranslator(QObject *parent) return translator; } -Q_EXPORT_PLUGIN(MplayerEngineFactory) +Q_EXPORT_PLUGIN2(mplayer,MplayerEngineFactory) diff --git a/src/plugins/Engines/mplayer/mplayermetadatamodel.cpp b/src/plugins/Engines/mplayer/mplayermetadatamodel.cpp index 7aa8b3e3a..0c4e97dd8 100644 --- a/src/plugins/Engines/mplayer/mplayermetadatamodel.cpp +++ b/src/plugins/Engines/mplayer/mplayermetadatamodel.cpp @@ -34,7 +34,6 @@ MplayerMetaDataModel::~MplayerMetaDataModel() QHash<QString, QString> MplayerMetaDataModel::audioProperties() { - QHash<QString, QString> vp; QHash<QString, QString> ap; ap.insert(tr("Size"), QString("%1 ").arg(QFileInfo(m_path).size ()/1024)+tr("KB")); //regular expressions @@ -101,6 +100,6 @@ QHash<QString, QString> MplayerMetaDataModel::audioProperties() else if (rx_id_audio_nch.indexIn(line) > -1) ap.insert(tr("Channels"), rx_id_audio_nch.cap(1)); } - vp.insert(tr("Resolution"), QString("%1x%2").arg(width).arg(height)); + ap.insert(tr("Resolution"), QString("%1x%2").arg(width).arg(height)); return ap; } diff --git a/src/plugins/Input/aac/decoderaacfactory.cpp b/src/plugins/Input/aac/decoderaacfactory.cpp index a70b8e793..21fe4a310 100644 --- a/src/plugins/Input/aac/decoderaacfactory.cpp +++ b/src/plugins/Input/aac/decoderaacfactory.cpp @@ -97,4 +97,4 @@ QTranslator *DecoderAACFactory::createTranslator(QObject *parent) return translator; } -Q_EXPORT_PLUGIN(DecoderAACFactory) +Q_EXPORT_PLUGIN2(aac,DecoderAACFactory) diff --git a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp index 77d556108..ad4ea9e95 100644 --- a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp +++ b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp @@ -166,4 +166,4 @@ QTranslator *DecoderFFmpegFactory::createTranslator(QObject *parent) return translator; } -Q_EXPORT_PLUGIN(DecoderFFmpegFactory) +Q_EXPORT_PLUGIN2(ffmpeg,DecoderFFmpegFactory) diff --git a/src/plugins/Input/modplug/decodermodplugfactory.cpp b/src/plugins/Input/modplug/decodermodplugfactory.cpp index fdef9d3ad..9d9d9e683 100644 --- a/src/plugins/Input/modplug/decodermodplugfactory.cpp +++ b/src/plugins/Input/modplug/decodermodplugfactory.cpp @@ -145,4 +145,4 @@ QTranslator *DecoderModPlugFactory::createTranslator(QObject *parent) return translator; } -Q_EXPORT_PLUGIN(DecoderModPlugFactory) +Q_EXPORT_PLUGIN2(modplug,DecoderModPlugFactory) diff --git a/src/plugins/Input/wavpack/decoderwavpackfactory.cpp b/src/plugins/Input/wavpack/decoderwavpackfactory.cpp index d36120857..8558aa661 100644 --- a/src/plugins/Input/wavpack/decoderwavpackfactory.cpp +++ b/src/plugins/Input/wavpack/decoderwavpackfactory.cpp @@ -141,4 +141,4 @@ QTranslator *DecoderWavPackFactory::createTranslator(QObject *parent) return translator; } -Q_EXPORT_PLUGIN(DecoderWavPackFactory) +Q_EXPORT_PLUGIN2(wavpack,DecoderWavPackFactory) |