Use ZapitTools::Latin1_to_UTF8

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1958 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 01bebde87a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2011-12-08 (Thu, 08 Dec 2011)



------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2011-12-08 15:11:38 +00:00
parent 3e81a32707
commit fd29e081ba
2 changed files with 2 additions and 2 deletions

View File

@@ -17,7 +17,6 @@ noinst_LIBRARIES = libneutrino_driver.a libneutrino_driver_netfile.a
libneutrino_driver_a_SOURCES = \
abstime.c \
encoding.cpp \
fontrenderer.cpp \
framebuffer.cpp \
fb_window.cpp \

View File

@@ -35,6 +35,7 @@
#include <system/localize.h>
#include <configfile.h>
#include <zapit/client/zapitclient.h>
#include <zapit/client/zapittools.h>
#include <string>
@@ -420,7 +421,7 @@ struct SNeutrinoSettings
int led_blink;
#define FILESYSTEM_ENCODING_TO_UTF8(a) (g_settings.filesystem_is_utf8 ? (a) : ZapitTools::Latin1_to_UTF8(a).c_str())
#define UTF8_TO_FILESYSTEM_ENCODING(a) (g_settings.filesystem_is_utf8 ? (a) : ZapitTools::UTF8_to_Latin1(a).c_str())
#define FILESYSTEM_ENCODING_TO_UTF8_STRING(a) (g_settings.filesystem_is_utf8 ? (a) : Latin1_to_UTF8(a))
#define FILESYSTEM_ENCODING_TO_UTF8_STRING(a) (g_settings.filesystem_is_utf8 ? (a) : ZapitTools::Latin1_to_UTF8(a))
#if 0