From da28679a1b55f208b1d6e5c1036bc7f2238f6e1b Mon Sep 17 00:00:00 2001 From: x42 Date: Sun, 31 Oct 2010 18:06:11 +0000 Subject: [PATCH] allow to configure SMPTE font. git-svn-id: https://gjacktransport.svn.sourceforge.net/svnroot/gjacktransport/trunk@55 4365b5fc-4a28-0410-96b5-80621495d1de --- src/gjacktransportrc | 4 ++++ src/main.c | 7 ++++++- src/rc_gjt.c | 9 +++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/gjacktransportrc b/src/gjacktransportrc index 5f27c2d..fbccaca 100644 --- a/src/gjacktransportrc +++ b/src/gjacktransportrc @@ -84,3 +84,7 @@ seek_stride=10.0 # do not try to use LASH no_lash=0 + +# SMPTE display font and optional size +;smpte_font=Sans +;smpte_font=Monospace 20 diff --git a/src/main.c b/src/main.c index b84e261..61f42f9 100644 --- a/src/main.c +++ b/src/main.c @@ -44,6 +44,7 @@ int want_quiet = 0; int no_lash = 0; // don't try to use LASH int max_mem = 6; int setup_done = 0; +char *smpte_font = NULL; #ifdef HAVE_LASH # include @@ -189,7 +190,10 @@ int main (int argc, char *argv[]) { if (mem < 0) mem=0; gtk_combo_box_set_active (GTK_COMBO_BOX(w),mem); update_spinbtns(); - //gtk_widget_modify_font (lookup_widget(window1,"label_smpte"), pango_font_description_from_string ("Sans 20")); // TODO + if (smpte_font) + gtk_widget_modify_font ( + lookup_widget(window1,"label_smpte"), + pango_font_description_from_string (smpte_font)); #ifdef HAVE_LASH @@ -226,6 +230,7 @@ int main (int argc, char *argv[]) { if (stg[i].name) free(stg[i].name); } free(stg); + if (smpte_font) free(smpte_font); return 0; } /* vi:set ts=8 sw=2: */ diff --git a/src/rc_gjt.c b/src/rc_gjt.c index cb53edc..c11fb69 100644 --- a/src/rc_gjt.c +++ b/src/rc_gjt.c @@ -40,6 +40,7 @@ extern double stride; extern gjtdata *stg; extern GtkWidget *window1; extern int no_lash; +extern char *smpte_font; extern int want_quiet; extern int max_mem; @@ -114,6 +115,9 @@ int parse_rc(const char*key, const char *value) { my_height=atoi(value); } else if (!strcmp(key,"no_lash")) { no_lash=atoi(value)?1:0; + } else if (!strcmp(key,"smpte_font")) { + if (smpte_font) free(smpte_font); + smpte_font = strdup(value); } else { if (!want_quiet) fprintf (stderr, "WARNING: unhandled Config parameter Key = '%s' \n", key); @@ -189,6 +193,11 @@ void write_rc(const char *fn) { fprintf(fp, "\n# do not try to use LASH\n"); fprintf(fp, "no_lash=%i\n", no_lash?1:0); fprintf(fp, "\n"); + if (smpte_font) { + fprintf(fp, "\n# SMPTE display font and optional size\n"); + fprintf(fp, "smpte_font=%s\n", smpte_font); + fprintf(fp, "\n"); + } fclose(fp); if (!want_quiet) -- 2.11.4.GIT