diff options
| author |  Robert Förster | 2014-02-27 12:53:54 +0000 |
|---|---|---|
| committer | Robert Förster | 2014-02-27 12:53:54 +0000 |
| commit | 3d55f451a2360d810209053e0f4115c1cc96a531 (patch) | |
| tree | e079971fd57faa4901f6db609434b9965f6db9b3 /src/modules/mediaplayer/MpWinampInterface.cpp | |
| parent | Fix ugliness of fonts on MacOS X for Retina display (diff) | |
| download | KVIrc-3d55f451a2360d810209053e0f4115c1cc96a531.tar.gz KVIrc-3d55f451a2360d810209053e0f4115c1cc96a531.tar.bz2 KVIrc-3d55f451a2360d810209053e0f4115c1cc96a531.zip | |
- some fixing for cmake 3
- compile with WIN32_LEAN_AND_MEAN
- fix compilation with qt5 on windows, thanks to d00p for the transparency fix
- some work on windows resource files (still in progress)
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@6370 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/mediaplayer/MpWinampInterface.cpp')
| -rw-r--r-- | src/modules/mediaplayer/MpWinampInterface.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/modules/mediaplayer/MpWinampInterface.cpp b/src/modules/mediaplayer/MpWinampInterface.cpp index c04631034..55c59c6e9 100644 --- a/src/modules/mediaplayer/MpWinampInterface.cpp +++ b/src/modules/mediaplayer/MpWinampInterface.cpp @@ -32,8 +32,6 @@ #include "KviLocale.h" #include "KviModule.h" -#include <windows.h> - #define IPC_STARTPLAY 102 #define IPC_ISPLAYING 104 @@ -169,7 +167,7 @@ static QTextCodec * mediaplayer_get_codec() { - QTextCodec * c= QTextCodec::codecForName(KVI_OPTION_STRING(KviOption_stringWinampTextEncoding).toAscii()); + QTextCodec * c= QTextCodec::codecForName(KVI_OPTION_STRING(KviOption_stringWinampTextEncoding).toLatin1()); if(!c)c = QTextCodec::codecForLocale(); return c; |