diff options
Diffstat (limited to 'src/modules/mediaplayer')
| -rw-r--r-- | src/modules/mediaplayer/MpAmipInterface.cpp | 13 | ||||
| -rw-r--r-- | src/modules/mediaplayer/MpWinampInterface.cpp | 5 |
2 files changed, 0 insertions, 18 deletions
diff --git a/src/modules/mediaplayer/MpAmipInterface.cpp b/src/modules/mediaplayer/MpAmipInterface.cpp index 4b41ff9c2..1e01aac05 100644 --- a/src/modules/mediaplayer/MpAmipInterface.cpp +++ b/src/modules/mediaplayer/MpAmipInterface.cpp @@ -94,12 +94,7 @@ static bool loadAmipDll() static QTextCodec * mediaplayer_get_codec() { QTextCodec * pCodec = 0; - -#if (QT_VERSION < 0x050000) - pCodec = QTextCodec::codecForName(KVI_OPTION_STRING(KviOption_stringWinampTextEncoding).toLatin1()); -#else pCodec = QTextCodec::codecForName(KVI_OPTION_STRING(KviOption_stringWinampTextEncoding).toUtf8()); -#endif if(!pCodec) pCodec = QTextCodec::codecForLocale(); @@ -244,11 +239,7 @@ QString MpAmipInterface::mrl() QTextCodec * pCodec = mediaplayer_get_codec(); if(pCodec) { -#if (QT_VERSION < 0x050000) - szRet = pCodec->toUnicode(szFn.toLatin1()); -#else szRet = pCodec->toUnicode(szFn.toUtf8()); -#endif } else { szRet = szFn; } @@ -265,11 +256,7 @@ QString getAmipString(const char * var) QString szString = eval_str(var); QTextCodec * pCodec = mediaplayer_get_codec(); if(pCodec) { -#if (QT_VERSION < 0x050000) - szRet = pCodec->toUnicode(szString.toLatin1()); -#else szRet = pCodec->toUnicode(szString.toUtf8()); -#endif } else { szRet = szString; } diff --git a/src/modules/mediaplayer/MpWinampInterface.cpp b/src/modules/mediaplayer/MpWinampInterface.cpp index 8d6981fd3..08666c864 100644 --- a/src/modules/mediaplayer/MpWinampInterface.cpp +++ b/src/modules/mediaplayer/MpWinampInterface.cpp @@ -167,12 +167,7 @@ static QTextCodec * mediaplayer_get_codec() { QTextCodec * pCodec = 0; - -#if (QT_VERSION < 0x050000) - pCodec = QTextCodec::codecForName(KVI_OPTION_STRING(KviOption_stringWinampTextEncoding).toLatin1()); -#else pCodec = QTextCodec::codecForName(KVI_OPTION_STRING(KviOption_stringWinampTextEncoding).toUtf8()); -#endif if(!pCodec) pCodec = QTextCodec::codecForLocale(); |