added win32 patches

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2537 90c681e8-e032-0410-971d-27865f9a5e38

3 files changed, 24 insertions, 13 deletions

diff --git a/src/plugins/Input/vorbis/decodervorbisfactory.cpp b/src/plugins/Input/vorbis/decodervorbisfactory.cpp
index 8d5676504..9b27dec34 100644
--- a/src/plugins/Input/vorbis/decodervorbisfactory.cpp
+++ b/src/plugins/Input/vorbis/decodervorbisfactory.cpp
@@ -78,7 +78,7 @@ QList<FileInfo *> DecoderVorbisFactory::createPlayList(const QString &fileName,
 {
     FileInfo *info = new FileInfo(fileName);
 
-    TagLib::Ogg::Vorbis::File fileRef(fileName.toLocal8Bit ());
+    TagLib::Ogg::Vorbis::File fileRef(fileName.toLocal8Bit().constData());
     TagLib::Ogg::XiphComment *tag = useMetaData ? fileRef.tag() : 0;
 
     if (tag && !tag->isEmpty())
diff --git a/src/plugins/Input/vorbis/vorbis.pro b/src/plugins/Input/vorbis/vorbis.pro
index d4b4c16e0..5be351f1d 100644
--- a/src/plugins/Input/vorbis/vorbis.pro
+++ b/src/plugins/Input/vorbis/vorbis.pro
@@ -9,7 +9,7 @@ SOURCES += decoder_vorbis.cpp \
     vorbismetadatamodel.cpp \
     replaygainreader.cpp
 TARGET = $$PLUGINS_PREFIX/Input/vorbis
-QMAKE_CLEAN = $$PLUGINS_PREFIX/Input/libvorbis.so
+
 INCLUDEPATH += ../../../
 CONFIG += release \
     warn_on \
@@ -17,12 +17,8 @@ CONFIG += release \
     link_pkgconfig
 TEMPLATE = lib
 QMAKE_LIBDIR += ../../../../lib
-LIBS += -lqmmp \
-    -L/usr/lib
-PKGCONFIG += taglib \
-    ogg \
-    vorbisfile \
-    vorbis
+
+
 TRANSLATIONS = translations/vorbis_plugin_ru.ts \
     translations/vorbis_plugin_uk_UA.ts \
     translations/vorbis_plugin_zh_CN.ts \
@@ -38,6 +34,21 @@ TRANSLATIONS = translations/vorbis_plugin_ru.ts \
     translations/vorbis_plugin_es.ts
 
 RESOURCES = translations/translations.qrc
-isEmpty (LIB_DIR):LIB_DIR = /lib
-target.path = $$LIB_DIR/qmmp/Input
-INSTALLS += target
+
+unix {
+    isEmpty (LIB_DIR):LIB_DIR = /lib
+    target.path = $$LIB_DIR/qmmp/Input
+    INSTALLS += target
+
+    PKGCONFIG += taglib ogg vorbisfile vorbis
+    LIBS += -lqmmp
+    QMAKE_CLEAN = $$PLUGINS_PREFIX/Input/libvorbis.so
+}
+
+win32 {
+    HEADERS += ../../../../src/qmmp/metadatamodel.h \
+               ../../../../src/qmmp/decoderfactory.h
+    QMAKE_LIBDIR += ../../../../bin
+    LIBS += -lqmmp0 -lvorbisfile -lvorbis -logg -ltag.dll -lm
+    LD_FLAGS += -no-undefined
+}
diff --git a/src/plugins/Input/vorbis/vorbismetadatamodel.cpp b/src/plugins/Input/vorbis/vorbismetadatamodel.cpp
index 321906f42..bb7451a50 100644
--- a/src/plugins/Input/vorbis/vorbismetadatamodel.cpp
+++ b/src/plugins/Input/vorbis/vorbismetadatamodel.cpp
@@ -43,7 +43,7 @@ VorbisMetaDataModel::~VorbisMetaDataModel()
 QHash<QString, QString> VorbisMetaDataModel::audioProperties()
 {
     QHash<QString, QString> ap;
-    TagLib::Ogg::Vorbis::File f (m_path.toLocal8Bit());
+    TagLib::Ogg::Vorbis::File f (m_path.toLocal8Bit().constData());
     if(f.audioProperties())
     {
         QString text = QString("%1").arg(f.audioProperties()->length()/60);
@@ -208,6 +208,6 @@ void VorbisCommentModel::save()
     //taglib bug workarround
     QString path = QString::fromLocal8Bit(m_file->name());
     delete m_file;
-    m_file = new TagLib::Ogg::Vorbis::File(path.toLocal8Bit());
+    m_file = new TagLib::Ogg::Vorbis::File(path.toLocal8Bit().constData());
     m_tag = m_file->tag();
 }