From 4a8bdb603640171e9ffedd29d38f3067603b5119 Mon Sep 17 00:00:00 2001 From: Dimitriy Ryazantcev Date: Thu, 18 Oct 2012 20:41:37 +0300 Subject: [PATCH 1/5] LMP: Win32 Fixes Signed-off-by: Dimitriy Ryazantcev --- src/plugins/lmp/cmake/FindTaglib.cmake | 2 +- src/plugins/lmp/localfileresolver.cpp | 2 +- src/plugins/lmp/player.cpp | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/plugins/lmp/cmake/FindTaglib.cmake b/src/plugins/lmp/cmake/FindTaglib.cmake index a3f2dd9..57ac8e2 100644 --- a/src/plugins/lmp/cmake/FindTaglib.cmake +++ b/src/plugins/lmp/cmake/FindTaglib.cmake @@ -52,7 +52,7 @@ else(TAGLIBCONFIG_EXECUTABLE) find_path(TAGLIB_INCLUDES NAMES - tag.h + taglib/tag.h PATH_SUFFIXES taglib PATHS ${KDE4_INCLUDE_DIR} diff --git a/src/plugins/lmp/localfileresolver.cpp b/src/plugins/lmp/localfileresolver.cpp index 0cb5cf4..30fe352 100644 --- a/src/plugins/lmp/localfileresolver.cpp +++ b/src/plugins/lmp/localfileresolver.cpp @@ -49,7 +49,7 @@ namespace LMP TagLib::FileRef LocalFileResolver::GetFileRef (const QString& file) const { #ifdef Q_OS_WIN32 - return TagLib::FileRef (file.toStdWString ().c_str ()); + return TagLib::FileRef (reinterpret_cast (file.utf16 ())); #else return TagLib::FileRef (file.toUtf8 ().constData ()); #endif diff --git a/src/plugins/lmp/player.cpp b/src/plugins/lmp/player.cpp index 3527f83..96d3732 100644 --- a/src/plugins/lmp/player.cpp +++ b/src/plugins/lmp/player.cpp @@ -38,6 +38,12 @@ #include "xmlsettingsmanager.h" #include "playlistparsers/playlistfactory.h" +#if defined(Q_OS_WIN32) + #ifdef GetObject + #undef GetObject + #endif +#endif + Q_DECLARE_METATYPE (Phonon::MediaSource); Q_DECLARE_METATYPE (QList); -- 1.7.11.msysgit.1