Re-add OpenGL window, we commented it out and forgot it that way.

[ccbs] / bigscreen / ccbs_bigscreen.cpp

diff --git a/bigscreen/ccbs_bigscreen.cpp b/bigscreen/ccbs_bigscreen.cpp
index da78fa1979ba0c452db47e2e8a13baa9f8ca86e9..17b71df61154d8364861df88db16910cc47ccf3a 100644 (file)
--- a/bigscreen/ccbs_bigscreen.cpp
+++ b/bigscreen/ccbs_bigscreen.cpp
@@ -11,6 +11,34 @@ iconv_t ucs4_iconv;
 class widestring : public std::basic_string<unsigned>
 {
 public:
 class widestring : public std::basic_string<unsigned>
 {
 public:

+       void operator= (const char *from)
+       {
+               unsigned bytes = std::strlen(from);
+               char *from_buf = strdup(from);
+               unsigned *to_buf = new unsigned[bytes + 1];
+
+               char *inptr = from_buf, *outptr = reinterpret_cast<char *> (to_buf);
+
+               size_t in_left = bytes;
+               size_t out_left = bytes * sizeof(unsigned);
+
+               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<unsigned *> (outptr), std::back_inserter(*this));
+
+               free(from_buf);
+               delete[] to_buf;
+       }

 };
 
 template<>
 };
 
 template<>


@@ -43,31 +71,7 @@ unsigned *std::char_traits<unsigned>::assign(unsigned *to, size_t n, unsigned a)
 template<>
 void pqxx::from_string<widestring>(const char *from, widestring &to)
 {
 template<>
 void pqxx::from_string<widestring>(const char *from, widestring &to)
 {

-       unsigned bytes = std::strlen(from);
-       char *from_buf = strdup(from);
-       unsigned *to_buf = new unsigned[bytes + 1];
-       
-       char *inptr = from_buf, *outptr = reinterpret_cast<char *> (to_buf);
-       
-       size_t in_left = bytes;
-       size_t out_left = bytes * sizeof(unsigned);
-
-       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");
-       }
-
-       to.erase(to.begin(), to.end());
-       std::copy(to_buf, reinterpret_cast<unsigned *> (outptr), std::back_inserter(to));
-
-       free(from_buf);
-       delete[] to_buf;
+       to = from;

 }
 
 class Tournament {
 }
 
 class Tournament {


@@ -122,7 +126,7 @@ public:
                        tourn->name = tournament["tournamentname"].as(tourn->name);
                } catch (PGSTD::out_of_range &e) {
                        tourn->id = -1;
                        tourn->name = tournament["tournamentname"].as(tourn->name);
                } catch (PGSTD::out_of_range &e) {
                        tourn->id = -1;

-//                     tourn->name = "";
+                       tourn->name = "";

                }
        }
 };
                }
        }
 };


@@ -163,7 +167,7 @@ int main(int argc, char **argv)
 {
        ucs4_iconv = iconv_open("ucs-4", "utf-8");
        
 {
        ucs4_iconv = iconv_open("ucs-4", "utf-8");
        

-//     GLWindow glw("CCBS bigscreen", 800, 600, 32, false, 16, -1);
+       GLWindow glw("CCBS bigscreen", 800, 600, 32, false, 16, -1);

        try {
                pqxx::connection conn("dbname=ccbs host=altersex.samfundet.no user=ccbs password=GeT|>>B_");
                FlagTrigger tournament_changed(conn, "active_tournament");
        try {
                pqxx::connection conn("dbname=ccbs host=altersex.samfundet.no user=ccbs password=GeT|>>B_");
                FlagTrigger tournament_changed(conn, "active_tournament");