diff options
| author | jstebbins <[email protected]> | 2008-10-15 18:39:45 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2008-10-15 18:39:45 +0000 |
| commit | 8079d10b0c22f7a7270828829286cb9947b8a99d (patch) | |
| tree | e03881798433f18d5903bc102c13d48102d7eafa /gtk/src/main.c | |
| parent | 5aab68603cb6b50a0a08c48497174f53ad771caf (diff) | |
LinGui: nested presets
new nested builtins.
user can create custom folders and drag n drop custom presets.
updated mac to linux presets plist translation tool to handle new format
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1835 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'gtk/src/main.c')
| -rw-r--r-- | gtk/src/main.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gtk/src/main.c b/gtk/src/main.c index 705bc2281..d20de0e52 100644 --- a/gtk/src/main.c +++ b/gtk/src/main.c @@ -486,8 +486,7 @@ main (int argc, char *argv[]) { GtkWidget *window; signal_user_data_t *ud; - gchar *preset; - gchar *folder; + GValue *preset; GError *error = NULL; GOptionContext *context; @@ -589,19 +588,20 @@ main (int argc, char *argv[]) ghb_x264_parse_options(ud, ""); // Populate the presets tree view - ghb_presets_list_init(ud, NULL, NULL, NULL); + ghb_presets_list_init(ud, NULL, 0); // Get the first preset name if (arg_preset != NULL) { - ghb_select_preset(ud->builder, NULL, arg_preset); + preset = ghb_parse_preset_path(arg_preset); + if (preset) + { + ghb_select_preset(ud->builder, preset); + ghb_value_free(preset); + } } else { - preset = ghb_settings_get_string (ud->settings, "default_preset"); - folder = ghb_settings_get_string (ud->settings, "default_folder"); - ghb_select_preset(ud->builder, folder, preset); - g_free(preset); - g_free(folder); + ghb_select_default_preset(ud->builder); } // Grey out widgets that are dependent on a disabled feature |