fraxinas/photobooth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

convenience macros for getting keys from ini files with debug & fix icc profile getting

Browse source
This commit is contained in:
Andreas Frisch 2017-07-25 11:09:45 +02:00
parent d962303eaa
commit 150faef87f
1 changed files with 31 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
photobooth.c
View file

@ -382,6 +382,9 @@ static void photo_booth_dispose (GObject *object)
g_free (G_template_filename); g_free (G_template_filename);
} }
#define READ_INT_INI_KEY(var, gkf, grp, key) {int i = g_key_file_get_integer (gkf, grp, key, NULL); if (i) {var = i; GST_TRACE ("read ini key [%s]:%s = %d", grp, key, var);} else {GST_TRACE ("ini key [%s]:%s not specified. keep default value %d", grp, key, var);}}
#define READ_STR_INI_KEY(var, gkf, grp, key) {gchar *str = g_key_file_get_string (gkf, grp, key, NULL); if (str) {var = g_strdup(str); GST_TRACE ("read ini key [%s]:%s = %s", grp, key, var); g_free(str);} else {GST_TRACE ("ini key [%s]:%s not specified. keep default value %s", grp, key, var);}}
void photo_booth_load_settings (PhotoBooth *pb, const gchar *filename) void photo_booth_load_settings (PhotoBooth *pb, const gchar *filename)
{ {
GKeyFile* gkf; GKeyFile* gkf;
@ -420,12 +423,13 @@ void photo_booth_load_settings (PhotoBooth *pb, const gchar *filename)
} }
if (g_key_file_has_group (gkf, "general")) if (g_key_file_has_group (gkf, "general"))
{ {
G_template_filename = g_key_file_get_string (gkf, "general", "template", NULL); gchar *screensaverfile = NULL, *save_path_template = NULL;
G_stylesheet_filename = g_key_file_get_string (gkf, "general", "stylesheet", NULL); READ_STR_INI_KEY (G_template_filename, gkf, "general", "template");
priv->countdown = g_key_file_get_integer (gkf, "general", "countdown", NULL); READ_STR_INI_KEY (G_stylesheet_filename, gkf, "general", "stylesheet");
priv->overlay_image = g_key_file_get_string (gkf, "general", "overlay_image", NULL); READ_INT_INI_KEY (priv->countdown, gkf, "general", "countdown");
priv->screensaver_timeout = g_key_file_get_integer (gkf, "general", "screensaver_timeout", NULL); READ_STR_INI_KEY (priv->overlay_image, gkf, "general", "overlay_image");
gchar *screensaverfile = g_key_file_get_string (gkf, "general", "screensaver_file", NULL); READ_INT_INI_KEY (priv->screensaver_timeout, gkf, "general", "screensaver_timeout");
READ_STR_INI_KEY (screensaverfile, gkf, "general", "screensaver_file");
if (screensaverfile) if (screensaverfile)
{ {
gchar *screensaverabsfilename; gchar *screensaverabsfilename;
@ -441,7 +445,7 @@ void photo_booth_load_settings (PhotoBooth *pb, const gchar *filename)
g_free (screensaverfile); g_free (screensaverfile);
g_free (screensaverabsfilename); g_free (screensaverabsfilename);
} }
gchar *save_path_template = g_key_file_get_string (gkf, "general", "save_path_template", NULL); READ_STR_INI_KEY (save_path_template, gkf, "general", "save_path_template");
if (save_path_template) if (save_path_template)
{ {
gchar *cdir; gchar *cdir;
@ -461,7 +465,8 @@ void photo_booth_load_settings (PhotoBooth *pb, const gchar *filename)
} }
if (g_key_file_has_group (gkf, "sounds")) if (g_key_file_has_group (gkf, "sounds"))
{ {
gchar *countdownaudiofile = g_key_file_get_string (gkf, "sounds", "countdown_audio_file", NULL); gchar *countdownaudiofile = NULL;
READ_STR_INI_KEY (countdownaudiofile, gkf, "sounds", "countdown_audio_file");
if (countdownaudiofile) if (countdownaudiofile)
{ {
gchar *audioabsfilename; gchar *audioabsfilename;
@ -477,38 +482,37 @@ void photo_booth_load_settings (PhotoBooth *pb, const gchar *filename)
g_free (countdownaudiofile); g_free (countdownaudiofile);
g_free (audioabsfilename); g_free (audioabsfilename);
} }
priv->ack_sound = g_key_file_get_string (gkf, "sounds", "ack_sound", NULL); READ_STR_INI_KEY (priv->ack_sound, gkf, "sounds", "ack_sound");
priv->error_sound = g_key_file_get_string (gkf, "sounds", "error_sound", NULL); READ_STR_INI_KEY (priv->error_sound, gkf, "sounds", "error_sound");
} }
if (g_key_file_has_group (gkf, "printer")) if (g_key_file_has_group (gkf, "printer"))
{ {
priv->printer_backend = g_key_file_get_string (gkf, "printer", "backend", NULL); READ_STR_INI_KEY (priv->printer_backend, gkf, "printer", "backend");
priv->print_copies_min = g_key_file_get_integer (gkf, "printer", "copies_min", NULL); READ_INT_INI_KEY (priv->print_copies_min, gkf, "printer", "copies_min");
priv->print_copies_max = g_key_file_get_integer (gkf, "printer", "copies_max", NULL); READ_INT_INI_KEY (priv->print_copies_max, gkf, "printer", "copies_max");
priv->print_copies_default = g_key_file_get_integer (gkf, "printer", "copies_default", NULL); READ_INT_INI_KEY (priv->print_copies_default, gkf, "printer", "copies_default");
priv->print_dpi = g_key_file_get_integer (gkf, "printer", "dpi", NULL); READ_INT_INI_KEY (priv->print_dpi, gkf, "printer", "dpi");
priv->print_width = g_key_file_get_integer (gkf, "printer", "width", NULL); READ_INT_INI_KEY (priv->print_width, gkf, "printer", "width");
priv->print_height = g_key_file_get_integer (gkf, "printer", "height", NULL); READ_INT_INI_KEY (priv->print_height, gkf, "printer", "height");
priv->print_icc_profile = g_key_file_get_string (gkf, "printer", "icc_profile", NULL); READ_STR_INI_KEY (priv->print_icc_profile, gkf, "printer", "icc_profile");
priv->print_x_offset = g_key_file_get_double (gkf, "printer", "offset_x", NULL); priv->print_x_offset = g_key_file_get_double (gkf, "printer", "offset_x", NULL);
priv->print_y_offset = g_key_file_get_double (gkf, "printer", "offset_y", NULL); priv->print_y_offset = g_key_file_get_double (gkf, "printer", "offset_y", NULL);
} }
if (g_key_file_has_group (gkf, "camera")) if (g_key_file_has_group (gkf, "camera"))
{ {
priv->preview_fps = g_key_file_get_integer (gkf, "camera", "fps", NULL); READ_INT_INI_KEY (priv->preview_fps, gkf, "camera", "preview_fps")
priv->preview_width = g_key_file_get_integer (gkf, "camera", "preview_width", NULL); READ_INT_INI_KEY (priv->preview_width, gkf, "camera", "preview_width");
priv->preview_height = g_key_file_get_integer (gkf, "camera", "preview_height", NULL); READ_INT_INI_KEY (priv->preview_height, gkf, "camera", "preview_height");
priv->cam_reeinit_before_snapshot = g_key_file_get_boolean (gkf, "camera", "cam_reeinit_before_snapshot", NULL); priv->cam_reeinit_before_snapshot = g_key_file_get_boolean (gkf, "camera", "cam_reeinit_before_snapshot", NULL);
priv->cam_reeinit_after_snapshot = g_key_file_get_boolean (gkf, "camera", "cam_reeinit_after_snapshot", NULL); priv->cam_reeinit_after_snapshot = g_key_file_get_boolean (gkf, "camera", "cam_reeinit_after_snapshot", NULL);
priv->cam_icc_profile = g_key_file_get_string (gkf, "camera", "icc_profile", NULL);
} }
if (g_key_file_has_group (gkf, "upload")) if (g_key_file_has_group (gkf, "upload"))
{ {
priv->facebook_put_uri = g_key_file_get_string (gkf, "upload", "facebook_put_uri", NULL); READ_STR_INI_KEY (priv->facebook_put_uri, gkf, "upload", "facebook_put_uri");
priv->imgur_album_id = g_key_file_get_string (gkf, "upload", "imgur_album_id", NULL); READ_STR_INI_KEY (priv->imgur_album_id, gkf, "upload", "imgur_album_id");
priv->imgur_access_token = g_key_file_get_string (gkf, "upload", "imgur_access_token", NULL); READ_STR_INI_KEY (priv->imgur_access_token, gkf, "upload", "imgur_access_token");
priv->imgur_description = g_key_file_get_string (gkf, "upload", "imgur_description", NULL); READ_STR_INI_KEY (priv->imgur_description, gkf, "upload", "imgur_description");
priv->upload_timeout = g_key_file_get_integer (gkf, "upload", "upload_timeout", NULL); READ_INT_INI_KEY (priv->upload_timeout, gkf, "upload", "upload_timeout");
} }
} }