Switch to FreeSerif for the time being, since it has more glyphs.

[ccbs] / bigscreen / ccbs_bigscreen.cpp

diff --git a/bigscreen/ccbs_bigscreen.cpp b/bigscreen/ccbs_bigscreen.cpp
index 59d5c377bf3b472f2e9db584d619028b3c6c9dfe..b82ab35a1ffaf3947a4f057b33ad3b4e2b74bae8 100644 (file)
--- a/bigscreen/ccbs_bigscreen.cpp
+++ b/bigscreen/ccbs_bigscreen.cpp
@@ -157,16 +157,18 @@ void main_loop(pqxx::connection &conn)
                sleep(1);
                return;
        }
+
+       memset(framebuf, 0, 800*600*4);
        
        pqxx::work t(conn, "trx");
 
        // fetch all songs
-       pqxx::result res( t.exec("SELECT * FROM songs") );
+       pqxx::result res( t.exec("SELECT * FROM songs WHERE title LIKE 'M%'") );
        unsigned y = 0;
        for (pqxx::result::const_iterator i = res.begin(); i != res.end(); ++i) {
                my_draw_text(i["title"].as(widestring()), framebuf, 0, y, 1, 255, 255, 255, font);
                y += 20;
-               std::fprintf(stderr, "%s\n", i["title"].c_str());
+//             std::fprintf(stderr, "%s\n", i["title"].c_str());
        }
        t.commit();
 
@@ -179,7 +181,7 @@ void init_freetype()
        FT_Library library;
        if (FT_Init_FreeType(&library))
                throw std::logic_error("FreeType init failed.");
-       if (FT_New_Face(library, "/usr/share/fonts/truetype/msttcorefonts/Georgia.ttf", 0, &font))
+       if (FT_New_Face(library, "/usr/share/fonts/truetype/freefont/FreeSerif.ttf", 0, &font))
                throw std::logic_error("Face opening failed.");
        if (FT_Set_Char_Size(font, 0, 12 * 64, 96, 96))
                throw std::logic_error("Size set failed.");
@@ -192,6 +194,9 @@ int my_draw_text(const widestring &str, unsigned char *buf, int xpos, int ypos,
 
        for (widestring::const_iterator i = str.begin(); i != str.end(); ++i) { 
                int glyph_index = FT_Get_Char_Index(face, *i);
+               if (*i > 128) {
+                       printf("Loading U+%x\n", *i);
+               }
                if (FT_Load_Glyph(face, glyph_index, FT_LOAD_RENDER))
                        continue;