FS-7506: make core specify default font instead of each place we use it

This commit is contained in:
Michael Jerris committed 2015-05-28 12:47:22 -05:00
1 parent 810a5d5831
commit 34b3804413
3 files changed
+5 -10

No files matched your search

@@ -1251,7 +1251,7 @@ static void layer_set_banner(conference_member_t *member, mcu_layer_t *layer, co
const char *bg = "#142e55";
char *parsed = NULL;
switch_event_t *params = NULL;
const char *font_face = "/usr/share/fonts/truetype/freefont/FreeSansOblique.ttf";
const char *font_face = NULL;
const char *var, *tmp = NULL;
char *dup = NULL;
-9
View File
@@ -287,10 +287,6 @@ static void stop_ticker(cv_context_t *context)
static void set_ticker(cv_context_t *context, const char *fg, const char *bg, const char *font_face, const char *fontsz, int speed, switch_img_position_t pos, const char *text)
{
if (zstr(font_face)) {
font_face = "FreeMono.ttf";
}
if (zstr(fg)) {
fg = "#cccccc";
}
@@ -362,11 +358,6 @@ static int add_text(cv_context_t *context, const char *nick, const char *fg, con
}
}
if (zstr(font_face)) {
font_face = "FreeMono.ttf";
}
if (zstr(fg)) {
fg = "#cccccc";
}