kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-03-13 12:40:17 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Michael Jerris 2015-04-17 17:42:24 -04:00
parent 810a5d5831
commit 34b3804413
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mod/applications/mod_conference/mod_conference.c
View File

@ -1251,7 +1251,7 @@ static void layer_set_banner(conference_member_t *member, mcu_layer_t *layer, co
const char *bg = "#142e55"; const char *bg = "#142e55";
char *parsed = NULL; char *parsed = NULL;
switch_event_t *params = 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; const char *var, *tmp = NULL;
char *dup = NULL; char *dup = NULL;

9
src/mod/applications/mod_cv/mod_cv.cpp
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) 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)) { if (zstr(fg)) {
fg = "#cccccc"; 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)) { if (zstr(fg)) {
fg = "#cccccc"; fg = "#cccccc";
} }

4
src/switch_core_video.c
View File

@ -508,6 +508,10 @@ SWITCH_DECLARE(switch_status_t) switch_img_txt_handle_create(switch_img_txt_hand
new_handle->pool = pool; new_handle->pool = pool;
new_handle->free_pool = free_pool; new_handle->free_pool = free_pool;
if (zstr(font_family)) {
font_family = switch_core_sprintf(new_handle->pool, "%s%s%s",SWITCH_GLOBAL_dirs.fonts_dir, SWITCH_PATH_SEPARATOR, "FreeMono.ttf");
}
if (!switch_is_file_path(font_family)) { if (!switch_is_file_path(font_family)) {
new_handle->font_family = switch_core_sprintf(new_handle->pool, "%s%s%s",SWITCH_GLOBAL_dirs.fonts_dir, SWITCH_PATH_SEPARATOR, font_family); new_handle->font_family = switch_core_sprintf(new_handle->pool, "%s%s%s",SWITCH_GLOBAL_dirs.fonts_dir, SWITCH_PATH_SEPARATOR, font_family);
} else { } else {