diff options
Diffstat (limited to 'src/plugins/Input')
| -rw-r--r-- | src/plugins/Input/Input.pro | 5 | ||||
| -rw-r--r-- | src/plugins/Input/cue/cue.pro | 17 | ||||
| -rw-r--r-- | src/plugins/Input/mad/decodermadfactory.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/Input/mad/detailsdialog.cpp | 10 | ||||
| -rw-r--r-- | src/plugins/Input/mad/mad.pro | 18 |
5 files changed, 34 insertions, 18 deletions
diff --git a/src/plugins/Input/Input.pro b/src/plugins/Input/Input.pro index 8235306ea..520d9060b 100644 --- a/src/plugins/Input/Input.pro +++ b/src/plugins/Input/Input.pro @@ -1,8 +1,10 @@ include(../../../qmmp.pri) -SUBDIRS += mad vorbis cue sndfile wavpack +SUBDIRS += mad cue TEMPLATE = subdirs +unix{ +SUBDIRS += vorbis sndfile wavpack contains(CONFIG, MODPLUG_PLUGIN){ SUBDIRS += modplug message(***************************) @@ -51,3 +53,4 @@ contains(CONFIG, CDAUDIO_PLUGIN){ message(* CD Audio plugin enabled *) message(***************************) } +} diff --git a/src/plugins/Input/cue/cue.pro b/src/plugins/Input/cue/cue.pro index d725fec40..932c2a3dd 100644 --- a/src/plugins/Input/cue/cue.pro +++ b/src/plugins/Input/cue/cue.pro @@ -1,6 +1,6 @@ include(../../plugins.pri) -#FORMS += detailsdialog.ui +FORMS += settingsdialog.ui HEADERS += decodercuefactory.h \ cueparser.h \ decoder_cue.h \ @@ -10,8 +10,11 @@ SOURCES += decoder_cue.cpp \ cueparser.cpp \ settingsdialog.cpp +win32:HEADERS += ../../../../src/qmmp/decoder.h \ + ../../../../src/qmmp/statehandler.h + TARGET =$$PLUGINS_PREFIX/Input/cue -QMAKE_CLEAN =$$PLUGINS_PREFIX/Input/libcue.so +unix:QMAKE_CLEAN =$$PLUGINS_PREFIX/Input/libcue.so INCLUDEPATH += ../../../ CONFIG += release \ @@ -20,8 +23,10 @@ plugin TEMPLATE = lib -QMAKE_LIBDIR += ../../../../lib -LIBS += -lqmmp -L/usr/lib +unix:QMAKE_LIBDIR += ../../../../lib +win32:QMAKE_LIBDIR += ../../../../bin +unix:LIBS += -lqmmp -L/usr/lib +win32:LIBS += -lqmmp0 TRANSLATIONS = translations/cue_plugin_ru.ts \ translations/cue_plugin_uk_UA.ts \ @@ -32,14 +37,14 @@ TRANSLATIONS = translations/cue_plugin_ru.ts \ translations/cue_plugin_de.ts RESOURCES = translations/translations.qrc +unix{ isEmpty(LIB_DIR){ LIB_DIR = /lib } target.path = $$LIB_DIR/qmmp/Input -FORMS += settingsdialog.ui - desktop.files = qmmp_cue.desktop desktop.path = /share/applications INSTALLS += target desktop +} diff --git a/src/plugins/Input/mad/decodermadfactory.cpp b/src/plugins/Input/mad/decodermadfactory.cpp index fa3f1d12b..b0efdc1d6 100644 --- a/src/plugins/Input/mad/decodermadfactory.cpp +++ b/src/plugins/Input/mad/decodermadfactory.cpp @@ -104,7 +104,7 @@ QList<FileInfo *> DecoderMADFactory::createPlayList(const QString &fileName, boo { FileInfo *info = new FileInfo(fileName); TagLib::Tag *tag = 0; - TagLib::MPEG::File fileRef(fileName.toLocal8Bit ()); + TagLib::MPEG::File fileRef(fileName.toLocal8Bit ().constData()); if (useMetaData) { diff --git a/src/plugins/Input/mad/detailsdialog.cpp b/src/plugins/Input/mad/detailsdialog.cpp index 885ff6e5e..7ab678ed5 100644 --- a/src/plugins/Input/mad/detailsdialog.cpp +++ b/src/plugins/Input/mad/detailsdialog.cpp @@ -93,7 +93,7 @@ DetailsDialog::~DetailsDialog() void DetailsDialog::loadMPEGInfo() { - TagLib::MPEG::File f (m_path.toLocal8Bit()); + TagLib::MPEG::File f (m_path.toLocal8Bit().constData()); //l.label //ui. f.audioProperties()->level(); QString text; @@ -136,7 +136,7 @@ void DetailsDialog::loadMPEGInfo() void DetailsDialog::loadTag() { - TagLib::MPEG::File f (m_path.toLocal8Bit()); + TagLib::MPEG::File f (m_path.toLocal8Bit().constData()); QTextCodec *codec = QTextCodec::codecForName ("UTF-8"); TagLib::Tag *tag = 0; @@ -199,7 +199,7 @@ void DetailsDialog::loadTag() void DetailsDialog::save() { - TagLib::MPEG::File* f = new TagLib::MPEG::File(m_path.toLocal8Bit()); + TagLib::MPEG::File* f = new TagLib::MPEG::File(m_path.toLocal8Bit().constData()); TagLib::String::Type type = TagLib::String::Latin1; QTextCodec *codec = 0; @@ -259,7 +259,7 @@ void DetailsDialog::save() void DetailsDialog::create() { - TagLib::MPEG::File *f = new TagLib::MPEG::File (m_path.toLocal8Bit()); + TagLib::MPEG::File *f = new TagLib::MPEG::File (m_path.toLocal8Bit().constData()); TagLib::Tag *tag = 0; if (selectedTag() == TagLib::MPEG::File::ID3v1) tag = f->ID3v1Tag(TRUE); @@ -277,7 +277,7 @@ void DetailsDialog::create() void DetailsDialog::deleteTag() { - TagLib::MPEG::File *f = new TagLib::MPEG::File (m_path.toLocal8Bit()); + TagLib::MPEG::File *f = new TagLib::MPEG::File (m_path.toLocal8Bit().constData()); f->strip(selectedTag()); delete f; loadTag(); diff --git a/src/plugins/Input/mad/mad.pro b/src/plugins/Input/mad/mad.pro index 1e872fe2a..2c8787675 100644 --- a/src/plugins/Input/mad/mad.pro +++ b/src/plugins/Input/mad/mad.pro @@ -15,17 +15,23 @@ SOURCES += decoder_mad.cpp \ tagextractor.cpp TARGET =$$PLUGINS_PREFIX/Input/mad -QMAKE_CLEAN =$$PLUGINS_PREFIX/Input/libmad.so +unix:QMAKE_CLEAN =$$PLUGINS_PREFIX/Input/libmad.so -INCLUDEPATH += ../../../ + +INCLUDEPATH += ../../../ +win32:INCLUDEPATH += D:\MINGW\include\taglib CONFIG += release \ warn_on \ plugin \ link_pkgconfig TEMPLATE = lib -QMAKE_LIBDIR += ../../../../lib -LIBS += -lqmmp -lmad -PKGCONFIG += taglib mad +unix:QMAKE_LIBDIR += ../../../../lib +win32:QMAKE_LIBDIR += ../../../../bin +unix:LIBS += -lqmmp -lmad +unix:PKGCONFIG += taglib mad + +win32:LIBS += -lqmmp0 -lmad -ltag.dll -ltag_c.dll + TRANSLATIONS = translations/mad_plugin_ru.ts \ translations/mad_plugin_uk_UA.ts \ translations/mad_plugin_zh_CN.ts \ @@ -35,8 +41,10 @@ TRANSLATIONS = translations/mad_plugin_ru.ts \ translations/mad_plugin_de.ts RESOURCES = translations/translations.qrc +unix{ isEmpty(LIB_DIR){ LIB_DIR = /lib } target.path = $$LIB_DIR/qmmp/Input INSTALLS += target +} |
