X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=bigscreen%2Fccbs_bigscreen.cpp;h=fb0d75740c1c0875cb0e3f18e38256c929a9f02e;hp=9740a8e718ed9b9ce9ac1210a07edef545b0fff0;hb=141adc9f5acb9ed1e98a206abb0d2e9cfdce6d2f;hpb=a5b3a3834ca7ca9317230ec7549d88873fe1ce64

diff --git a/bigscreen/ccbs_bigscreen.cpp b/bigscreen/ccbs_bigscreen.cpp
index 9740a8e..fb0d757 100644
--- a/bigscreen/ccbs_bigscreen.cpp
+++ b/bigscreen/ccbs_bigscreen.cpp
@@ -6,50 +6,8 @@
 #include <ft2build.h>
 #include FT_FREETYPE_H
 #include <tinyptc.h>
-#include <endian.h>
 #include "flagtrigger.h"
-
-iconv_t ucs4_iconv;
-
-// UCS-4 string with support for getting from UTF-8
-class widestring : public std::wstring
-{
-public:
-	void operator= (const char *from)
-	{
-		unsigned bytes = std::strlen(from);
-		char *from_buf = strdup(from);
-		wchar_t *to_buf = new wchar_t[bytes + 1];
-
-		char *inptr = from_buf, *outptr = reinterpret_cast<char *> (to_buf);
-
-		size_t in_left = bytes;
-		size_t out_left = bytes * sizeof(wchar_t);
-
-		size_t ret = iconv(ucs4_iconv, NULL, NULL, &outptr, &out_left);
-		if (ret == (size_t)(-1)) {
-			throw std::runtime_error("Error in iconv during initialization");
-		}
-
-		ret = iconv(ucs4_iconv, &inptr, &in_left, &outptr, &out_left);
-		if (ret == (size_t)(-1)) {
-			perror("iconv");
-			throw std::runtime_error("Error in iconv during conversion");
-		}
-
-		erase(begin(), end());
-		std::copy(to_buf, reinterpret_cast<wchar_t *> (outptr), std::back_inserter(*this));
-
-		free(from_buf);
-		delete[] to_buf;
-	}
-};
-
-template<>
-void pqxx::from_string<widestring>(const char *from, widestring &to)
-{
-	to = from;
-}
+#include "widestring.h"
 
 int my_draw_text(const widestring &str, unsigned char *buf, int xpos, int ypos, bool real_render, int r, int g, int b, std::vector<FT_Face> &fontlist);
 
@@ -211,12 +169,6 @@ int my_draw_text(const widestring &str, unsigned char *buf, int xpos, int ypos,
 
 int main(int argc, char **argv)
 {
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-	ucs4_iconv = iconv_open("ucs-4le", "utf-8");
-#else	
-	ucs4_iconv = iconv_open("ucs-4be", "utf-8");
-#endif
-	
 	ptc_open("CCBS bigscreen", 800, 600);
 	
 	try {