X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=gtk%2Fsrc%2Fpresets.c;h=66f69a748badedbb635503cb4b0fa06e12be09fe;hb=0884cb45aeeb60a46effe1d1056a61fe68300ea7;hp=08ac7b3a2664f795af2c66b358be4cd0738f70f8;hpb=533776bbad20db93fe964bc69975f108b2a30888;p=handbrake-jp%2Fhandbrake-jp-git.git diff --git a/gtk/src/presets.c b/gtk/src/presets.c index 08ac7b3a..66f69a74 100644 --- a/gtk/src/presets.c +++ b/gtk/src/presets.c @@ -11,32 +11,254 @@ * any later version. * */ +#include +#include +#include +#include #include #include #include #include #include +#include "hb.h" #include "settings.h" #include "callbacks.h" #include "audiohandler.h" +#include "subtitlehandler.h" #include "hb-backend.h" #include "plist.h" #include "resources.h" #include "presets.h" #include "values.h" +#include "lang.h" + +#define MAX_NESTED_PRESET 3 -// These are flags. One bit for each feature enum { - PRESETS_CUST = 0x01, - PRESETS_FOLDER = 0x02, + PRESETS_BUILTIN = 0, + PRESETS_CUSTOM }; static GValue *presetsPlist = NULL; static GValue *internalPlist = NULL; static GValue *prefsPlist = NULL; +static gboolean prefs_modified = FALSE; static const GValue* preset_dict_get_value(GValue *dict, const gchar *key); +static void store_plist(GValue *plist, const gchar *name); +static void store_presets(void); +static void store_prefs(void); + +gint +preset_path_cmp(gint *indices1, gint len1, gint *indices2, gint len2) +{ + gint ii; + for (ii = 0; ii < len1 && ii < len2; ii++) + { + if (indices1[ii] != indices2[ii]) + return indices1[ii] - indices2[ii]; + } + return len1 - len2; +} + +// This only handle limited depth +GtkTreePath* +ghb_tree_path_new_from_indices(gint *indices, gint len) +{ + switch (len) + { + case 1: + return gtk_tree_path_new_from_indices( + indices[0], -1); + case 2: + return gtk_tree_path_new_from_indices( + indices[0], indices[1], -1); + case 3: + return gtk_tree_path_new_from_indices( + indices[0], indices[1], indices[2], -1); + case 4: + return gtk_tree_path_new_from_indices( + indices[0], indices[1], indices[2], indices[3], -1); + case 5: + return gtk_tree_path_new_from_indices( + indices[0], indices[1], indices[2], indices[3], indices[4], -1); + default: + return NULL; + } +} + +GValue* +ghb_parse_preset_path(const gchar *path) +{ + gchar **split; + GValue *preset; + gint ii; + + preset = ghb_array_value_new(MAX_NESTED_PRESET); + split = g_strsplit(path, "#", MAX_NESTED_PRESET); + for (ii = 0; split[ii] != NULL; ii++) + { + ghb_array_append(preset, ghb_string_value_new(split[ii])); + } + g_strfreev(split); + return preset; +} + +static GValue* +preset_path_from_indices(GValue *presets, gint *indices, gint len) +{ + gint ii; + GValue *path; + + g_debug("preset_path_from_indices"); + path = ghb_array_value_new(MAX_NESTED_PRESET); + for (ii = 0; ii < len; ii++) + { + GValue *dict; + gint count, folder; + const GValue *name; + + count = ghb_array_len(presets); + if (indices[ii] >= count) break; + dict = ghb_array_get_nth(presets, indices[ii]); + name = ghb_dict_lookup(dict, "PresetName"); + if (name) + ghb_array_append(path, ghb_value_dup(name)); + folder = ghb_value_boolean(preset_dict_get_value(dict, "Folder")); + if (!folder) + break; + presets = ghb_dict_lookup(dict, "ChildrenArray"); + } + return path; +} + +gchar* +ghb_preset_path_string(const GValue *path) +{ + gint count, ii; + GString *gstr; + GValue *val; + gchar *str; + + gstr = g_string_new(""); + if (path != NULL) + { + count = ghb_array_len(path); + for (ii = 0; ii < count; ii++) + { + val = ghb_array_get_nth(path, ii); + str = ghb_value_string(val); + g_string_append(gstr, str); + if (ii < count-1) + g_string_append(gstr, "->"); + g_free(str); + } + } + str = g_string_free(gstr, FALSE); + return str; +} + +void +dump_preset_path(const gchar *msg, const GValue *path) +{ + gchar *str; + + if (path) + debug_show_type (G_VALUE_TYPE(path)); + str = ghb_preset_path_string(path); + g_message("%s path: (%s)", msg, str); + g_free(str); +} + +void +dump_preset_indices(const gchar *msg, gint *indices, gint len) +{ + gint ii; + + g_message("%s indices: len %d", msg, len); + for (ii = 0; ii < len; ii++) + { + printf("%d ", indices[ii]); + } + printf("\n"); +} + +#if 0 +static gint +preset_path_cmp(const GValue *path1, const GValue *path2) +{ + gint count, ii; + GValue *val; + gchar *str1, *str2; + gint result; + + count = ghb_array_len(path1); + ii = ghb_array_len(path2); + if (ii != count) + return ii - count; + for (ii = 0; ii < count; ii++) + { + val = ghb_array_get_nth(path1, ii); + str1 = ghb_value_string(val); + val = ghb_array_get_nth(path2, ii); + str2 = ghb_value_string(val); + result = strcmp(str1, str2); + if (result != 0) + return result; + g_free(str1); + g_free(str2); + } + return 0; +} +#endif + +static GValue* +presets_get_dict(GValue *presets, gint *indices, gint len) +{ + gint ii, count, folder; + GValue *dict = NULL; + + g_debug("presets_get_dict ()"); + for (ii = 0; ii < len; ii++) + { + count = ghb_array_len(presets); + if (indices[ii] >= count) return NULL; + dict = ghb_array_get_nth(presets, indices[ii]); + if (ii < len-1) + { + folder = ghb_value_boolean(preset_dict_get_value(dict, "Folder")); + if (!folder) + return NULL; + presets = ghb_dict_lookup(dict, "ChildrenArray"); + } + } + if (ii < len) + return NULL; + return dict; +} + +static GValue* +presets_get_folder(GValue *presets, gint *indices, gint len) +{ + gint ii, count, folder; + GValue *dict; + + g_debug("presets_get_folder ()"); + for (ii = 0; ii < len; ii++) + { + count = ghb_array_len(presets); + if (indices[ii] >= count) return NULL; + dict = ghb_array_get_nth(presets, indices[ii]); + folder = ghb_value_boolean(preset_dict_get_value(dict, "Folder")); + if (!folder) + break; + presets = ghb_dict_lookup(dict, "ChildrenArray"); + } + if (ii < len) + return NULL; + return presets; +} static GValue* plist_get_dict(GValue *presets, const gchar *name) @@ -48,33 +270,30 @@ plist_get_dict(GValue *presets, const gchar *name) static const gchar* preset_get_name(GValue *dict) { - return g_value_get_string(ghb_dict_lookup(dict, "preset_name")); + return g_value_get_string(preset_dict_get_value(dict, "PresetName")); } -gint -ghb_preset_flags(GValue *dict) +static gboolean +preset_folder_is_open(GValue *dict) { const GValue *gval; - gint ptype = 0; - gval = preset_dict_get_value(dict, "preset_type"); - if (gval) - { - ptype = ghb_value_int(gval); - } - return ptype; + gval = preset_dict_get_value(dict, "FolderOpen"); + if (gval != NULL) + return g_value_get_boolean(gval); + return FALSE; } -static GValue* -presets_get_first_dict(GValue *presets) +gboolean +ghb_preset_folder(GValue *dict) { - gint count; - - g_debug("presets_get_first_dict ()"); - if (presets == NULL) return NULL; - count = ghb_array_len(presets); - if (count <= 0) return NULL; - return ghb_array_get_nth(presets, 0); + return ghb_value_int(preset_dict_get_value(dict, "Folder")); +} + +gint +ghb_preset_type(GValue *dict) +{ + return ghb_value_int(preset_dict_get_value(dict, "Type")); } static void @@ -94,36 +313,17 @@ presets_remove_nth(GValue *presets, gint pos) gboolean ghb_presets_remove( GValue *presets, - gint folder_pos, - gint pos) + gint *indices, + gint len) { - GValue *nested; - gint ii; + GValue *folder = NULL; - if (folder_pos >= 0) - { - if (pos >= 0) - { - ii = pos; - nested = ghb_array_get_nth(presets, folder_pos); - nested = ghb_dict_lookup(nested, "preset_folder"); - } - else - { - ii = folder_pos; - nested = presets; - } - } - else - { - ii = pos; - nested = presets; - } - if (ii >= 0) - presets_remove_nth(nested, ii); + folder = presets_get_folder(presets, indices, len-1); + if (folder) + presets_remove_nth(folder, indices[len-1]); else { - g_warning("internal preset lookup error (%d/%d)", folder_pos, pos); + g_warning("ghb_presets_remove (): internal preset lookup error"); return FALSE; } return TRUE; @@ -133,259 +333,402 @@ static void ghb_presets_replace( GValue *presets, GValue *dict, - gint folder_pos, - gint pos) + gint *indices, + gint len) { - GValue *nested; - gint ii; + GValue *folder = NULL; - if (folder_pos >= 0) - { - if (pos >= 0) - { - ii = pos; - nested = ghb_array_get_nth(presets, folder_pos); - nested = ghb_dict_lookup(nested, "preset_folder"); - } - else - { - ii = folder_pos; - nested = presets; - } - } + folder = presets_get_folder(presets, indices, len-1); + if (folder) + ghb_array_replace(folder, indices[len-1], dict); else { - ii = pos; - nested = presets; + g_warning("ghb_presets_replace (): internal preset lookup error"); } - if (ii >= 0) - ghb_array_replace(nested, ii, dict); +} + +static void +ghb_presets_insert( + GValue *presets, + GValue *dict, + gint *indices, + gint len) +{ + GValue *folder = NULL; + + folder = presets_get_folder(presets, indices, len-1); + if (folder) + ghb_array_insert(folder, indices[len-1], dict); else { - g_warning("internal preset lookup error (%d/%d)", folder_pos, pos); + g_warning("ghb_presets_insert (): internal preset lookup error"); } } static gint -presets_find_pos(GValue *presets, const gchar *name, gint type) +presets_find_element(GValue *presets, const gchar *name) { GValue *dict; - gint count, ii, ptype, last; + gint count, ii; + g_debug("presets_find_element () (%s)", name); if (presets == NULL || name == NULL) return -1; - last = count = ghb_array_len(presets); + count = ghb_array_len(presets); for (ii = 0; ii < count; ii++) { const gchar *str; dict = ghb_array_get_nth(presets, ii); str = preset_get_name(dict); - ptype = ghb_value_int(preset_dict_get_value(dict, "preset_type")); - if (strcasecmp(name, str) <= 0 && ptype == type) + if (strcmp(name, str) == 0) { return ii; } - if (ptype == type) - last = ii+1; } - return last; + return -1; } static gint -presets_find_folder(GValue *presets, const gchar *name) +single_find_pos(GValue *presets, const gchar *name, gint type) { GValue *dict; - gint count, ii, ptype; + gint count, ii, ptype, last; if (presets == NULL || name == NULL) return -1; - count = ghb_array_len(presets); + last = count = ghb_array_len(presets); for (ii = 0; ii < count; ii++) { const gchar *str; dict = ghb_array_get_nth(presets, ii); str = preset_get_name(dict); - ptype = ghb_value_int(preset_dict_get_value(dict, "preset_type")); - if ((ptype & PRESETS_FOLDER) && strcasecmp(name, str) == 0) + ptype = ghb_value_int(preset_dict_get_value(dict, "Type")); + if (strcasecmp(name, str) <= 0 && ptype == type) { return ii; } + if (ptype == type) + last = ii+1; } - return -1; + return last; } -static gint -presets_find_preset(GValue *presets, const gchar *name) +static gint* +presets_find_pos(const GValue *path, gint type, gint *len) { + GValue *nested; + GValue *val; + gint count, ii; + gboolean folder; + gint *indices = NULL; + const gchar *name; GValue *dict; - gint count, ii, ptype; - - g_debug("presets_find_preset () (%s)", name); - if (presets == NULL || name == NULL) return -1; - count = ghb_array_len(presets); - for (ii = 0; ii < count; ii++) + + g_debug("presets_find_pos () "); + nested = presetsPlist; + count = ghb_array_len(path); + indices = g_malloc(MAX_NESTED_PRESET * sizeof(gint)); + for (ii = 0; ii < count-1; ii++) { - const gchar *str; - dict = ghb_array_get_nth(presets, ii); - str = preset_get_name(dict); - ptype = ghb_value_int(preset_dict_get_value(dict, "preset_type")); - if (!(ptype & PRESETS_FOLDER) && strcasecmp(name, str) == 0) - { - return ii; - } + val = ghb_array_get_nth(path, ii); + name = g_value_get_string(val); + indices[ii] = presets_find_element(nested, name); + if (indices[ii] == -1) return NULL; + dict = ghb_array_get_nth(nested, indices[ii]); + folder = ghb_value_boolean(preset_dict_get_value(dict, "Folder")); + nested = NULL; + if (!folder) + break; + nested = ghb_dict_lookup(dict, "ChildrenArray"); } - return -1; + if (nested) + { + const gchar *name; + + name = g_value_get_string(ghb_array_get_nth(path, count-1)); + indices[ii] = single_find_pos(nested, name, type); + ii++; + } + *len = ii; + return indices; } -gboolean -ghb_presets_find( - GValue *presets, - const gchar *folder, - const gchar *name, - gint *folder_pos, - gint *pos) +static gint +preset_tree_depth(GValue *dict) { - GValue *nested; + gboolean folder; - *pos = -1; - *folder_pos = -1; - g_debug("ghb_presets_find () (%s) (%s)", folder, name); - if (folder == NULL || folder[0] == 0) + folder = ghb_value_boolean(preset_dict_get_value(dict, "Folder")); + if (folder) { - // name could be a folder or a regular preset - *folder_pos = presets_find_folder(presets, name); - if (*folder_pos < 0) + gint depth = 0; + gint count, ii; + GValue *presets; + + presets = ghb_dict_lookup(dict, "ChildrenArray"); + count = ghb_array_len(presets); + for (ii = 0; ii < count; ii++) { - *pos = presets_find_preset(presets, name); - if (*pos < 0) - { - g_debug("No presets/folder (%s)", name); - return FALSE; - } + gint tmp; + + dict = ghb_array_get_nth(presets, ii); + tmp = preset_tree_depth(dict); + depth = MAX(depth, tmp); } + return depth + 1; } else { - *folder_pos = presets_find_folder(presets, folder); - if (*folder_pos < 0) + return 1; + } +} + +static gboolean +preset_is_default(GValue *dict) +{ + const GValue *val; + + val = preset_dict_get_value(dict, "Default"); + return ghb_value_boolean(val); +} + +static void +presets_clear_default(GValue *presets) +{ + gint count, ii; + + count = ghb_array_len(presets); + for (ii = 0; ii < count; ii++) + { + GValue *dict; + gboolean folder; + + dict = ghb_array_get_nth(presets, ii); + folder = ghb_value_boolean(preset_dict_get_value(dict, "Folder")); + if (folder) { - g_debug("No presets folder (%s)", folder); - return FALSE; + GValue *nested; + + nested = ghb_dict_lookup(dict, "ChildrenArray"); + presets_clear_default(nested); } - nested = ghb_array_get_nth(presets, *folder_pos); - nested = ghb_dict_lookup(nested, "preset_folder"); - if (name != NULL) + else { - *pos = presets_find_preset(nested, name); - if (*pos < 0) + if (preset_is_default(dict)) { - g_debug("No preset (%s/%s)", folder, name); - return FALSE; + ghb_dict_insert(dict, g_strdup("Default"), + ghb_boolean_value_new(FALSE)); } } } - return TRUE; } -static GValue* -presets_get_dict(GValue *presets, gint folder_pos, gint pos) +static void +presets_customize(GValue *presets) { - g_debug("presets_get_dict () (%d) (%d)", folder_pos, pos); - if (presets == NULL) return NULL; - GValue *nested; - gint ii; + gint count, ii; - if (folder_pos >= 0) + count = ghb_array_len(presets); + for (ii = 0; ii < count; ii++) { - if (pos >= 0) + GValue *dict; + gboolean folder; + gint ptype; + + dict = ghb_array_get_nth(presets, ii); + + ptype = ghb_value_int(preset_dict_get_value(dict, "Type")); + if (ptype != PRESETS_CUSTOM) { - ii = pos; - nested = ghb_array_get_nth(presets, folder_pos); - nested = ghb_dict_lookup(nested, "preset_folder"); + ghb_dict_insert(dict, g_strdup("Type"), + ghb_int64_value_new(PRESETS_CUSTOM)); } - else + folder = ghb_value_boolean(preset_dict_get_value(dict, "Folder")); + if (folder) { - ii = folder_pos; - nested = presets; + GValue *nested; + + nested = ghb_dict_lookup(dict, "ChildrenArray"); + presets_customize(nested); } } - else - { - ii = pos; - nested = presets; - } - if (ii >= 0) - return ghb_array_get_nth(nested, ii); - else - { - g_warning("internal preset lookup error (%d/%d)", folder_pos, pos); - return NULL; - } } -static gint -ghb_presets_get_type( - GValue *presets, - gint folder_pos, - gint pos) +static gint* +presets_find_default2(GValue *presets, gint *len) { - GValue *nested; - GValue *dict; - gint ii; - gint flags = 0; + gint count, ii; + gint *indices; - if (folder_pos >= 0) + count = ghb_array_len(presets); + for (ii = 0; ii < count; ii++) { - if (pos >= 0) + GValue *dict; + gboolean folder; + + dict = ghb_array_get_nth(presets, ii); + folder = ghb_value_boolean(preset_dict_get_value(dict, "Folder")); + if (folder) { - ii = pos; - nested = ghb_array_get_nth(presets, folder_pos); - nested = ghb_dict_lookup(nested, "preset_folder"); + GValue *nested; + gint pos = *len; + + nested = ghb_dict_lookup(dict, "ChildrenArray"); + (*len)++; + indices = presets_find_default2(nested, len); + if (indices) + { + indices[pos] = ii; + return indices; + } + else + *len = pos; } else { - ii = folder_pos; - nested = presets; + if (preset_is_default(dict)) + { + indices = g_malloc(MAX_NESTED_PRESET * sizeof(gint)); + indices[*len] = ii; + (*len)++; + return indices; + } } } - else - { - ii = pos; - nested = presets; - } - if (ii >= 0) - { - dict = ghb_array_get_nth(nested, ii); - flags = ghb_preset_flags(dict); - } - else - { - g_warning("internal preset lookup error (%d/%d)", folder_pos, pos); - } - return flags; + return NULL; } -void -ghb_set_preset_default(GValue *settings) +static gint* +presets_find_default(GValue *presets, gint *len) { - gchar *preset, *folder; - - preset = ghb_settings_get_string (settings, "preset"); - folder = ghb_settings_get_string (settings, "folder"); - ghb_settings_set_string(settings, "default_preset", preset); - ghb_settings_set_string(settings, "default_folder", folder); - ghb_prefs_save(settings); - g_free(preset); - g_free(folder); + *len = 0; + return presets_find_default2(presets, len); } -// Used for sorting dictionaries. -gint -key_cmp(gconstpointer a, gconstpointer b) +gint* +ghb_preset_indices_from_path( + GValue *presets, + const GValue *path, + gint *len) { - gchar *stra = (gchar*)a; - gchar *strb = (gchar*)b; - - return strcmp(stra, strb); -} + GValue *nested; + GValue *val; + gint count, ii; + gint *indices = NULL; + const gchar *name; + GValue *dict; + gboolean folder; + + g_debug("ghb_preset_indices_from_path () "); + nested = presets; + count = ghb_array_len(path); + if (count) + indices = g_malloc(MAX_NESTED_PRESET * sizeof(gint)); + *len = 0; + for (ii = 0; ii < count; ii++) + { + val = ghb_array_get_nth(path, ii); + name = g_value_get_string(val); + indices[ii] = presets_find_element(nested, name); + if (indices[ii] == -1) + { + g_free(indices); + return NULL; + } + if (ii < count-1) + { + dict = ghb_array_get_nth(nested, indices[ii]); + folder = ghb_value_boolean(preset_dict_get_value(dict, "Folder")); + if (!folder) + { + g_free(indices); + return NULL; + } + nested = ghb_dict_lookup(dict, "ChildrenArray"); + } + } + *len = ii; + return indices; +} + +static gint +ghb_presets_get_type( + GValue *presets, + gint *indices, + gint len) +{ + GValue *dict; + gint type = 0; + + dict = presets_get_dict(presets, indices, len); + if (dict) + { + type = ghb_preset_type(dict); + } + else + { + g_warning("ghb_presets_get_type (): internal preset lookup error"); + } + return type; +} + +static gboolean +ghb_presets_get_folder( + GValue *presets, + gint *indices, + gint len) +{ + GValue *dict; + gboolean folder = FALSE; + + dict = presets_get_dict(presets, indices, len); + if (dict) + { + folder = ghb_preset_folder(dict); + } + else + { + g_warning("ghb_presets_get_folder (): internal preset lookup error"); + } + return folder; +} + +void +presets_set_default(gint *indices, gint len) +{ + GValue *dict; + + g_debug("presets_set_default ()"); + presets_clear_default(presetsPlist); + dict = presets_get_dict(presetsPlist, indices, len); + if (dict) + { + ghb_dict_insert(dict, g_strdup("Default"), ghb_boolean_value_new(TRUE)); + } + store_presets(); +} + +static void +presets_set_folder_open(gboolean open, gint *indices, gint len) +{ + GValue *dict; + + g_debug("presets_set_folder_open ()"); + dict = presets_get_dict(presetsPlist, indices, len); + if (dict) + { + ghb_dict_insert(dict, g_strdup("FolderOpen"), + ghb_boolean_value_new(open)); + } +} + +// Used for sorting dictionaries. +gint +key_cmp(gconstpointer a, gconstpointer b) +{ + gchar *stra = (gchar*)a; + gchar *strb = (gchar*)b; + + return strcmp(stra, strb); +} static const GValue* preset_dict_get_value(GValue *dict, const gchar *key) @@ -409,25 +752,16 @@ preset_dict_get_value(GValue *dict, const gchar *key) const gchar* ghb_presets_get_description(GValue *pdict) { - if (pdict == NULL) return g_strdup(""); - return g_value_get_string( - preset_dict_get_value(pdict, "preset_description")); -} - - -static const GValue* -preset_get_value(const gchar *folder, const gchar *name, const gchar *key) -{ - GValue *dict = NULL; - gint folder_pos, pos; + const gchar *desc; - if (ghb_presets_find(presetsPlist, folder, name, &folder_pos, &pos)) - { - dict = presets_get_dict(presetsPlist, folder_pos, pos); - } - return preset_dict_get_value(dict, key); + if (pdict == NULL) return NULL; + desc = g_value_get_string( + preset_dict_get_value(pdict, "PresetDescription")); + if (desc[0] == 0) return NULL; + return desc; } + static void init_settings_from_dict( GValue *dest, GValue *internal, GValue *dict); @@ -556,32 +890,33 @@ preset_to_ui(signal_user_data_t *ud, GValue *dict) { g_debug("preset_to_ui()\n"); // Initialize the ui from presets file. - GValue *internal; + GValue *internal, *hidden; // Get key list from internal default presets. This way we do not // load any unknown keys. if (internalPlist == NULL) return; internal = plist_get_dict(internalPlist, "Presets"); + hidden = plist_get_dict(internalPlist, "XlatPresets"); // Setting a ui widget will cause the corresponding setting // to be set, but it also triggers a callback that can // have the side effect of using other settings values // that have not yet been set. So set *all* settings first // then update the ui. init_settings_from_dict(ud->settings, internal, dict); + init_settings_from_dict(ud->settings, hidden, dict); init_ui_from_dict(ud, internal, dict); + init_ui_from_dict(ud, hidden, dict); - if (ghb_settings_get_boolean(ud->settings, "allow_tweaks")) + if (dict != NULL) { - const GValue *gval; - gval = preset_dict_get_value(dict, "deinterlace"); - if (gval) - { - ghb_ui_update(ud, "tweak_deinterlace", gval); - } - gval = preset_dict_get_value(dict, "denoise"); - if (gval) + GValue *val; + gboolean dd; + + val = ghb_dict_lookup(dict, "PictureDecombDeinterlace"); + if (val != NULL) { - ghb_ui_update(ud, "tweak_denoise", gval); + dd = ghb_value_boolean(val); + ghb_ui_update(ud, "PictureDeinterlaceDecomb", ghb_boolean_value(!dd)); } } } @@ -592,62 +927,138 @@ ghb_settings_to_ui(signal_user_data_t *ud, GValue *dict) init_ui_from_dict(ud, dict, dict); } +static GValue *current_preset = NULL; + +gboolean +ghb_preset_is_custom() +{ + const GValue *val; + + if (current_preset == NULL) return FALSE; + val = preset_dict_get_value(current_preset, "Type"); + return (ghb_value_int(val) == 1); +} + void -ghb_set_preset(signal_user_data_t *ud, const gchar *folder, const gchar *name) +ghb_set_preset_from_indices(signal_user_data_t *ud, gint *indices, gint len) { GValue *dict = NULL; - gint folder_pos, pos, ptype; - - g_debug("ghb_set_preset() %s %s\n", folder, name); - if (ghb_presets_find(presetsPlist, folder, name, &folder_pos, &pos)) - dict = presets_get_dict(presetsPlist, folder_pos, pos); + gint fallback[2] = {0, -1}; + if (indices) + dict = presets_get_dict(presetsPlist, indices, len); if (dict == NULL) { - dict = presets_get_first_dict(presetsPlist); - folder = NULL; - if (dict) - name = preset_get_name(dict); - else - name = NULL; - folder = ""; + indices = fallback; + len = 1; + dict = presets_get_dict(presetsPlist, indices, len); } - if (dict == NULL || name == NULL) + if (dict == NULL) { preset_to_ui(ud, NULL); + current_preset = NULL; } else { - ptype = ghb_value_int(preset_dict_get_value(dict, "preset_type")); - if (ptype & PRESETS_FOLDER) + GValue *path; + gboolean folder; + + current_preset = dict; + folder = ghb_value_boolean(preset_dict_get_value(dict, "Folder")); + if (folder) preset_to_ui(ud, NULL); else preset_to_ui(ud, dict); - ghb_settings_set_string(ud->settings, "preset", name); - ghb_settings_set_string(ud->settings, "folder", folder); + path = preset_path_from_indices(presetsPlist, indices, len); + ghb_settings_set_value(ud->settings, "preset", path); + ghb_value_free(path); } } +static const GValue* +curr_preset_get_value(const gchar *key) +{ + if (current_preset == NULL) return NULL; + return preset_dict_get_value(current_preset, key); +} + void ghb_update_from_preset( signal_user_data_t *ud, - const gchar *folder, - const gchar *name, const gchar *key) { const GValue *gval; - g_debug("ghb_update_from_preset() %s %s", name, key); - if (name == NULL) return; - gval = preset_get_value(folder, name, key); + g_debug("ghb_update_from_preset() %s", key); + gval = curr_preset_get_value(key); if (gval != NULL) { ghb_ui_update(ud, key, gval); } } +static void +ghb_select_preset2( + GtkBuilder *builder, + gint *indices, + gint len) +{ + GtkTreeView *treeview; + GtkTreeSelection *selection; + GtkTreeModel *store; + GtkTreeIter iter; + GtkTreePath *path; + + g_debug("ghb_select_preset2()"); + treeview = GTK_TREE_VIEW(GHB_WIDGET(builder, "presets_list")); + selection = gtk_tree_view_get_selection (treeview); + store = gtk_tree_view_get_model (treeview); + path = ghb_tree_path_new_from_indices(indices, len); + if (path) + { + if (gtk_tree_model_get_iter(store, &iter, path)) + { + gtk_tree_selection_select_iter (selection, &iter); + } + else + { + if (gtk_tree_model_get_iter_first(store, &iter)) + gtk_tree_selection_select_iter (selection, &iter); + } + gtk_tree_path_free(path); + } +} + +void +ghb_select_preset(GtkBuilder *builder, const GValue *path) +{ + gint *indices, len; + + g_debug("ghb_select_preset()"); + indices = ghb_preset_indices_from_path(presetsPlist, path, &len); + if (indices) + { + ghb_select_preset2(builder, indices, len); + g_free(indices); + } +} + +void +ghb_select_default_preset(GtkBuilder *builder) +{ + gint *indices, len; + + g_debug("ghb_select_default_preset()"); + indices = presets_find_default(presetsPlist, &len); + if (indices) + { + ghb_select_preset2(builder, indices, len); + g_free(indices); + } +} + gchar* -ghb_get_user_config_dir() +ghb_get_user_config_dir(gchar *subdir) { const gchar *dir; gchar *config; @@ -666,6 +1077,23 @@ ghb_get_user_config_dir() if (!g_file_test(config, G_FILE_TEST_IS_DIR)) g_mkdir (config, 0755); } + if (subdir) + { + gchar **split; + gint ii; + + split = g_strsplit(subdir, G_DIR_SEPARATOR_S, -1); + for (ii = 0; split[ii] != NULL; ii++) + { + gchar *tmp; + + tmp = g_strdup_printf ("%s/%s", config, split[ii]); + g_free(config); + config = tmp; + if (!g_file_test(config, G_FILE_TEST_IS_DIR)) + g_mkdir (config, 0755); + } + } return config; } @@ -675,7 +1103,7 @@ store_plist(GValue *plist, const gchar *name) gchar *config, *path; FILE *file; - config = ghb_get_user_config_dir(); + config = ghb_get_user_config_dir(NULL); path = g_strdup_printf ("%s/%s", config, name); file = g_fopen(path, "w"); g_free(config); @@ -690,7 +1118,7 @@ load_plist(const gchar *name) gchar *config, *path; GValue *plist = NULL; - config = ghb_get_user_config_dir(); + config = ghb_get_user_config_dir(NULL); path = g_strdup_printf ("%s/%s", config, name); if (g_file_test(path, G_FILE_TEST_IS_REGULAR)) { @@ -701,12 +1129,141 @@ load_plist(const gchar *name) return plist; } +gboolean +ghb_lock_file(const gchar *name) +{ +#if !defined(_WIN32) + gchar *config, *path; + int fd, lock = 0; + + config = ghb_get_user_config_dir(NULL); + path = g_strdup_printf ("%s/%s", config, name); + fd = open(path, O_RDWR|O_CREAT, S_IRUSR|S_IWUSR); + if (fd >= 0) + lock = lockf(fd, F_TLOCK, 0); + if (lock) + close(fd); + g_free(config); + g_free(path); + return !lock; +#else + return 1; +#endif +} + +void +ghb_write_pid_file() +{ +#if !defined(_WIN32) + gchar *config, *path; + pid_t pid; + FILE *fp; + int fd, lock; + + pid = getpid(); + + config = ghb_get_user_config_dir(NULL); + path = g_strdup_printf ("%s/ghb.pid.%d", config, pid); + + fp = g_fopen(path, "w"); + fprintf(fp, "%d\n", pid); + fclose(fp); + + fd = open(path, O_RDWR|O_CREAT, S_IRUSR|S_IWUSR); + lock = lockf(fd, F_TLOCK, 0); + + g_free(config); + g_free(path); +#endif +} + +void +ghb_unlink_pid_file(int pid) +{ + gchar *config, *path; + + config = ghb_get_user_config_dir(NULL); + path = g_strdup_printf ("%s/ghb.pid.%d", config, pid); + + if (g_file_test(path, G_FILE_TEST_IS_REGULAR)) + { + g_unlink(path); + } + + g_free(config); + g_free(path); +} + +int +ghb_find_pid_file() +{ + const gchar *file; + gchar *config; + + config = ghb_get_user_config_dir(NULL); + + if (g_file_test(config, G_FILE_TEST_IS_DIR)) + { + GDir *gdir = g_dir_open(config, 0, NULL); + file = g_dir_read_name(gdir); + while (file) + { + if (strncmp(file, "ghb.pid.", 8) == 0) + { + gchar *path; + pid_t my_pid; + int pid; + + sscanf(file, "ghb.pid.%d", &pid); + my_pid = getpid(); + if (my_pid == pid) + { + file = g_dir_read_name(gdir); + continue; + } + path = g_strdup_printf("%s/%s", config, file); + +#if !defined(_WIN32) + int fd, lock = 1; + + fd = open(path, O_RDWR); + if (fd >= 0) + { + lock = lockf(fd, F_TLOCK, 0); + } + if (lock == 0) + { + close(fd); + g_dir_close(gdir); + g_unlink(path); + g_free(path); + g_free(config); + return pid; + } + g_free(path); + close(fd); +#else + g_dir_close(gdir); + g_unlink(path); + g_free(path); + g_free(config); + return pid; +#endif + } + file = g_dir_read_name(gdir); + } + g_dir_close(gdir); + } + g_free(config); + return -1; +} + static void remove_plist(const gchar *name) { gchar *config, *path; - config = ghb_get_user_config_dir(); + config = ghb_get_user_config_dir(NULL); path = g_strdup_printf ("%s/%s", config, name); if (g_file_test(path, G_FILE_TEST_IS_REGULAR)) { @@ -728,6 +1285,7 @@ ghb_prefs_to_ui(signal_user_data_t *ud) GHashTableIter iter; + g_debug("ghb_prefs_to_ui"); prefs_initializing = TRUE; // Setting a ui widget will cause the corresponding setting @@ -752,14 +1310,14 @@ ghb_prefs_to_ui(signal_user_data_t *ud) // pointer will break strict-aliasing rules" while (g_hash_table_iter_next( &iter, (gpointer*)(void*)&key, (gpointer*)(void*)&gval)) - { + { const GValue *value = NULL; if (dict) value = ghb_dict_lookup(dict, key); if (value == NULL) value = gval; ghb_settings_set_value(ud->settings, key, value); - } + } internal = plist_get_dict(internalPlist, "Preferences"); ghb_dict_iter_init(&iter, internal); // middle (void*) cast prevents gcc warning "defreferencing type-punned @@ -790,13 +1348,15 @@ ghb_prefs_to_ui(signal_user_data_t *ud) ghb_ui_update(ud, "hbfd", ghb_int64_value(0)); } gval = ghb_settings_get_value(ud->settings, "default_source"); - ghb_settings_set_value (ud->settings, "source", gval); + ghb_settings_set_value (ud->settings, "scan_source", gval); + str = ghb_settings_get_string(ud->settings, "destination_dir"); + ghb_ui_update(ud, "dest_dir", ghb_string_value(str)); - gchar *path = g_strdup_printf ("%s/new_video.mp4", str); - ghb_ui_update(ud, "destination", ghb_string_value(path)); + gchar *file = g_strdup_printf ("new_video.mp4"); + ghb_ui_update(ud, "dest_file", ghb_string_value(file)); g_free(str); - g_free(path); + g_free(file); prefs_initializing = FALSE; } @@ -820,20 +1380,43 @@ ghb_prefs_save(GValue *settings) // pointer will break strict-aliasing rules" while (g_hash_table_iter_next( &iter, (gpointer*)(void*)&key, (gpointer*)(void*)&value)) - { - value = ghb_settings_get_value(settings, key); - if (value != NULL) - { + { + value = ghb_settings_get_value(settings, key); + if (value != NULL) + { ghb_dict_insert(pref_dict, g_strdup(key), ghb_value_dup(value)); - } + } + } + store_prefs(); + prefs_modified = FALSE; +} + +void +ghb_pref_set(GValue *settings, const gchar *key) +{ + const GValue *value, *value2; + + if (prefs_initializing) return; + value = ghb_settings_get_value(settings, key); + if (value != NULL) + { + GValue *dict; + dict = plist_get_dict(prefsPlist, "Preferences"); + if (dict == NULL) return; + value2 = ghb_dict_lookup(dict, key); + if (ghb_value_cmp(value, value2) != 0) + { + ghb_dict_insert(dict, g_strdup(key), ghb_value_dup(value)); + store_prefs(); + prefs_modified = TRUE; + } } - store_plist(prefsPlist, "preferences"); } void ghb_pref_save(GValue *settings, const gchar *key) { - const GValue *value; + const GValue *value, *value2; if (prefs_initializing) return; value = ghb_settings_get_value(settings, key); @@ -842,8 +1425,23 @@ ghb_pref_save(GValue *settings, const gchar *key) GValue *dict; dict = plist_get_dict(prefsPlist, "Preferences"); if (dict == NULL) return; - ghb_dict_insert(dict, g_strdup(key), ghb_value_dup(value)); - store_plist(prefsPlist, "preferences"); + value2 = ghb_dict_lookup(dict, key); + if (ghb_value_cmp(value, value2) != 0) + { + ghb_dict_insert(dict, g_strdup(key), ghb_value_dup(value)); + store_prefs(); + prefs_modified = FALSE; + } + } +} + +void +ghb_prefs_store(void) +{ + if (prefs_modified) + { + store_prefs(); + prefs_modified = FALSE; } } @@ -908,13 +1506,41 @@ ghb_settings_close() ghb_value_free(prefsPlist); } +#if defined(_WIN32) +gchar* +FindFirstCDROM(void) +{ + gint ii, drives; + gchar drive[5]; + + strcpy(drive, "A:" G_DIR_SEPARATOR_S); + drives = GetLogicalDrives(); + for (ii = 0; ii < 26; ii++) + { + if (drives & 0x01) + { + guint dtype; + + drive[0] = 'A' + ii; + dtype = GetDriveType(drive); + if (dtype == DRIVE_CDROM) + { + return g_strdup(drive); + } + } + drives >>= 1; + } + return NULL; +} +#endif + void ghb_prefs_load(signal_user_data_t *ud) { GValue *dict, *internal; GHashTableIter iter; gchar *key; - GValue *gval; + GValue *gval, *path; g_debug("ghb_prefs_load"); prefsPlist = load_plist("preferences"); @@ -922,264 +1548,1323 @@ ghb_prefs_load(signal_user_data_t *ud) prefsPlist = ghb_dict_value_new(); dict = plist_get_dict(prefsPlist, "Preferences"); internal = plist_get_dict(internalPlist, "Preferences"); - if (dict == NULL && internal) - { + if (dict == NULL && internal) + { dict = ghb_dict_value_new(); ghb_dict_insert(prefsPlist, g_strdup("Preferences"), dict); - // Get defaults from internal defaults + // Get defaults from internal defaults ghb_dict_iter_init(&iter, internal); // middle (void*) cast prevents gcc warning "defreferencing type-punned // pointer will break strict-aliasing rules" while (g_hash_table_iter_next( &iter, (gpointer*)(void*)&key, (gpointer*)(void*)&gval)) - { + { ghb_dict_insert(dict, g_strdup(key), ghb_value_dup(gval)); - } - const gchar *dir = g_get_user_special_dir (G_USER_DIRECTORY_VIDEOS); + } + + const gchar *dir = g_get_user_special_dir (G_USER_DIRECTORY_DESKTOP); + if (dir == NULL) + { + dir = "."; + } + ghb_dict_insert(dict, + g_strdup("ExportDirectory"), ghb_value_dup(ghb_string_value(dir))); + + dir = g_get_user_special_dir (G_USER_DIRECTORY_VIDEOS); if (dir == NULL) { dir = "."; } ghb_dict_insert(dict, g_strdup("destination_dir"), ghb_value_dup(ghb_string_value(dir))); - store_plist(prefsPlist, "preferences"); - } -} + + ghb_dict_insert(dict, + g_strdup("SrtDir"), ghb_value_dup(ghb_string_value(dir))); +#if defined(_WIN32) + gchar *source; + + source = FindFirstCDROM(); + if (source == NULL) + { + source = g_strdup("C:" G_DIR_SEPARATOR_S); + } + ghb_dict_insert(dict, g_strdup("default_source"), + ghb_value_dup(ghb_string_value(source))); + g_free(source); +#endif + store_prefs(); + } + // Read legacy default_preset preference and update accordingly + path = ghb_dict_lookup(dict, "default_preset"); + if (path) + { + gint *indices, len; + + if (G_VALUE_TYPE(path) == G_TYPE_STRING) + { + GValue *str = path; + + path = ghb_array_value_new(1); + ghb_array_append(path, ghb_value_dup(str)); + indices = ghb_preset_indices_from_path(presetsPlist, path, &len); + ghb_value_free(path); + } + else + indices = ghb_preset_indices_from_path(presetsPlist, path, &len); + + if (indices) + { + presets_set_default(indices, len); + g_free(indices); + } + ghb_dict_remove(dict, "default_preset"); + store_prefs(); + } +} + +static const gchar* +get_preset_color(gint type, gboolean folder) +{ + const gchar *color; + + if (type == PRESETS_CUSTOM) + { + color = "DimGray"; + if (folder) + { + color = "black"; + } + } + else + { + color = "blue"; + if (folder) + { + color = "Navy"; + } + } + return color; +} void ghb_presets_list_init( signal_user_data_t *ud, - GValue *presets, - const gchar *parent_name, - GtkTreeIter *parent) + gint *indices, + gint len) { GtkTreeView *treeview; - GtkTreeIter iter; + GtkTreeIter iter, titer, *piter; + GtkTreeStore *store; const gchar *preset; - gchar *def_preset, *def_folder; + GtkTreePath *parent_path; const gchar *description; - gint flags, custom; gboolean def; - gint count, ii, ptype; + gint count, ii; GValue *dict; + gint *more_indices; + GValue *presets = NULL; g_debug("ghb_presets_list_init ()"); + more_indices = g_malloc((len+1)*sizeof(gint)); + memcpy(more_indices, indices, len*sizeof(gint)); + presets = presets_get_folder(presetsPlist, indices, len); if (presets == NULL) - presets = presetsPlist; - def_folder = ghb_settings_get_string(ud->settings, "default_folder"); - def_preset = ghb_settings_get_string(ud->settings, "default_preset"); + { + g_warning("Failed to find parent folder when adding child."); + return; + } count = ghb_array_len(presets); treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "presets_list")); store = GTK_TREE_STORE(gtk_tree_view_get_model(treeview)); - ii = 0; - while (ii < count) + parent_path = ghb_tree_path_new_from_indices(indices, len); + if (parent_path) + { + gtk_tree_model_get_iter(GTK_TREE_MODEL(store), &titer, parent_path); + piter = &titer; + gtk_tree_path_free(parent_path); + } + else + { + piter = NULL; + } + for (ii = 0; ii < count; ii++) { + const gchar *color; + gint type; + gboolean folder; + // Additional settings, add row - g_debug("Adding rows"); dict = ghb_array_get_nth(presets, ii); preset = preset_get_name(dict); - def = FALSE; - if (strcmp(preset, def_preset) == 0) - { - if (parent_name && strcmp(parent_name, def_folder) == 0) - def = TRUE; - else if (parent_name == NULL && def_folder[0] == 0) - def = TRUE; - } + more_indices[len] = ii; + def = preset_is_default(dict); description = ghb_presets_get_description(dict); - gtk_tree_store_append(store, &iter, parent); - flags = ghb_preset_flags(dict); - custom = flags & PRESETS_CUST; + gtk_tree_store_append(store, &iter, piter); + type = ghb_preset_type(dict); + folder = ghb_preset_folder(dict); + color = get_preset_color(type, folder); gtk_tree_store_set(store, &iter, 0, preset, 1, def ? 800 : 400, 2, def ? 2 : 0, - 3, custom ? "black" : "blue", + 3, color, 4, description, + 5, type == PRESETS_BUILTIN ? 0 : 1, -1); - if (def && parent) + if (def && piter) { GtkTreePath *path; + GtkTreeIter ppiter; - path = gtk_tree_model_get_path(GTK_TREE_MODEL(store), parent); + if (gtk_tree_model_iter_parent( + GTK_TREE_MODEL(store), &ppiter, piter)) + { + path = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &ppiter); + gtk_tree_view_expand_row(treeview, path, FALSE); + gtk_tree_path_free(path); + } + path = gtk_tree_model_get_path(GTK_TREE_MODEL(store), piter); gtk_tree_view_expand_row(treeview, path, FALSE); gtk_tree_path_free(path); } - ptype = ghb_value_int(preset_dict_get_value(dict, "preset_type")); - if (ptype & PRESETS_FOLDER) + if (folder) { - GValue *nested; - nested = ghb_dict_lookup(dict, "preset_folder"); - if (nested != NULL) - ghb_presets_list_init(ud, nested, preset, &iter); + ghb_presets_list_init(ud, more_indices, len+1); + if (preset_folder_is_open(dict)) + { + GtkTreePath *path; + + if (piter != NULL) + { + path = gtk_tree_model_get_path(GTK_TREE_MODEL(store), piter); + gtk_tree_view_expand_row(treeview, path, FALSE); + gtk_tree_path_free(path); + } + path = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &iter); + gtk_tree_view_expand_row(treeview, path, FALSE); + gtk_tree_path_free(path); + } } - ii++; } - g_free(def_preset); - g_free(def_folder); + g_free(more_indices); } static void presets_list_update_item( signal_user_data_t *ud, - GValue *presets, - GtkTreeIter *iter, - gint folder_pos, - gint pos) + gint *indices, + gint len, + gboolean recurse) { GtkTreeView *treeview; GtkTreeStore *store; - const gchar *preset; - gchar *def_preset, *def_folder; + GtkTreeIter iter; + GtkTreePath *treepath; + const gchar *name; const gchar *description; - gint flags, custom; - gboolean def; + gint type; + gboolean def, folder; GValue *dict; - const gchar *parent_name; + const gchar *color; g_debug("presets_list_update_item ()"); - dict = presets_get_dict(presets, folder_pos, pos); + dict = presets_get_dict(presetsPlist, indices, len); if (dict == NULL) return; - def_folder = ghb_settings_get_string(ud->settings, "default_folder"); - def_preset = ghb_settings_get_string(ud->settings, "default_preset"); treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "presets_list")); store = GTK_TREE_STORE(gtk_tree_view_get_model(treeview)); + treepath = ghb_tree_path_new_from_indices(indices, len); + gtk_tree_model_get_iter(GTK_TREE_MODEL(store), &iter, treepath); // Additional settings, add row - preset = preset_get_name(dict); - if (pos >= 0) + name = preset_get_name(dict); + def = preset_is_default(dict); + + description = ghb_presets_get_description(dict); + type = ghb_preset_type(dict); + folder = ghb_preset_folder(dict); + color = get_preset_color(type, folder); + gtk_tree_store_set(store, &iter, 0, name, + 1, def ? 800 : 400, + 2, def ? 2 : 0, + 3, color, + 4, description, + 5, type == PRESETS_BUILTIN ? 0 : 1, + -1); + if (recurse && folder) + { + ghb_presets_list_init(ud, indices, len); + } +} + +static void +presets_list_insert( + signal_user_data_t *ud, + gint *indices, + gint len) +{ + GtkTreeView *treeview; + GtkTreeIter iter, titer, *piter; + GtkTreeStore *store; + const gchar *preset; + const gchar *description; + gint type; + gboolean def, folder; + gint count; + GValue *presets; + GtkTreePath *parent_path; + GValue *dict; + const gchar *color; + + g_debug("presets_list_insert ()"); + treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "presets_list")); + store = GTK_TREE_STORE(gtk_tree_view_get_model(treeview)); + presets = presets_get_folder(presetsPlist, indices, len-1); + if (presets == NULL) { - GValue *parent_dict; - parent_dict = presets_get_dict(presets, folder_pos, -1); - parent_name = preset_get_name(parent_dict); + g_warning("Failed to find parent folder while adding child."); + return; + } + parent_path = ghb_tree_path_new_from_indices(indices, len-1); + if (parent_path) + { + gtk_tree_model_get_iter(GTK_TREE_MODEL(store), &titer, parent_path); + piter = &titer; + gtk_tree_path_free(parent_path); } else - parent_name = NULL; - def = FALSE; - if (strcmp(preset, def_preset) == 0) { - if (parent_name && strcmp(parent_name, def_folder) == 0) - def = TRUE; - else if (parent_name == NULL && def_folder[0] == 0) - def = TRUE; + piter = NULL; } + count = ghb_array_len(presets); + if (indices[len-1] >= count) + return; + // Additional settings, add row + dict = ghb_array_get_nth(presets, indices[len-1]); + preset = preset_get_name(dict); + def = preset_is_default(dict); description = ghb_presets_get_description(dict); - flags = ghb_preset_flags(dict); - custom = flags & PRESETS_CUST; - gtk_tree_store_set(store, iter, 0, preset, + gtk_tree_store_insert(store, &iter, piter, indices[len-1]); + type = ghb_preset_type(dict); + folder = ghb_preset_folder(dict); + color = get_preset_color(type, folder); + gtk_tree_store_set(store, &iter, 0, preset, 1, def ? 800 : 400, 2, def ? 2 : 0, - 3, custom ? "black" : "blue", + 3, color, 4, description, + 5, type == PRESETS_BUILTIN ? 0 : 1, -1); - if (flags & PRESETS_FOLDER) + if (folder) + { + ghb_presets_list_init(ud, indices, len); + } +} + +static void +presets_list_remove( + signal_user_data_t *ud, + gint *indices, + gint len) +{ + GtkTreeView *treeview; + GtkTreePath *treepath; + GtkTreeIter iter; + GtkTreeStore *store; + + g_debug("presets_list_remove ()"); + treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "presets_list")); + store = GTK_TREE_STORE(gtk_tree_view_get_model(treeview)); + treepath = ghb_tree_path_new_from_indices(indices, len); + if (treepath) + { + if (gtk_tree_model_get_iter(GTK_TREE_MODEL(store), &iter, treepath)) + gtk_tree_store_remove(store, &iter); + gtk_tree_path_free(treepath); + } +} + +static void +remove_std_presets(signal_user_data_t *ud) +{ + gint count, ii; + gint indices = 0; + + count = ghb_array_len(presetsPlist); + for (ii = count-1; ii >= 0; ii--) + { + GValue *dict; + gint ptype; + + dict = ghb_array_get_nth(presetsPlist, ii); + ptype = ghb_value_int(preset_dict_get_value(dict, "Type")); + if (ptype == PRESETS_BUILTIN) + { + if (ghb_presets_remove(presetsPlist, &indices, 1)) + { + presets_list_remove(ud, &indices, 1); + } + } + } +} + +void +ghb_save_queue(GValue *queue) +{ + pid_t pid; + char *path; + + pid = getpid(); + path = g_strdup_printf ("queue.%d", pid); + store_plist(queue, path); + g_free(path); +} + +GValue* +ghb_load_queue() +{ + GValue *queue; + pid_t pid; + char *path; + + pid = getpid(); + path = g_strdup_printf ("queue.%d", pid); + queue = load_plist(path); + g_free(path); + return queue; +} + +GValue* +ghb_load_old_queue(int pid) +{ + GValue *queue; + char *path; + + path = g_strdup_printf ("queue.%d", pid); + queue = load_plist(path); + g_free(path); + return queue; +} + +void +ghb_remove_old_queue_file(int pid) +{ + char *path; + + path = g_strdup_printf ("queue.%d", pid); + remove_plist(path); + g_free(path); +} + +void +ghb_remove_queue_file() +{ + pid_t pid; + char *path; + + pid = getpid(); + path = g_strdup_printf ("queue.%d", pid); + remove_plist(path); + g_free(path); +} + +typedef struct +{ + gchar *mac_val; + gchar *lin_val; +} value_map_t; + +static value_map_t vcodec_xlat[] = +{ + {"MPEG-4 (FFmpeg)", "ffmpeg"}, + {"MPEG-4 (XviD)", "ffmpeg"}, + {"H.264 (x264)", "x264"}, + {"VP3 (Theora)", "theora"}, + {NULL,NULL} +}; + +static value_map_t acodec_xlat[] = +{ + {"AAC (faac)", "faac"}, + {"AAC (CoreAudio)", "faac"}, + {"AC3 Passthru", "ac3"}, + {"MP3 (lame)", "lame"}, + {"Vorbis (vorbis)", "vorbis"}, + {NULL,NULL} +}; + +value_map_t container_xlat[] = +{ + {"MP4 file", "mp4"}, + {"M4V file", "mp4"}, + {"MKV file", "mkv"}, + {"AVI file", "mkv"}, + {"OGM file", "mkv"}, + {NULL, NULL} +}; + +value_map_t framerate_xlat[] = +{ + {"Same as source", "source"}, + {"5", "5"}, + {"10", "10"}, + {"12", "12"}, + {"15", "15"}, + {"23.976", "23.976"}, + {"24", "24"}, + {"25", "25"}, + {"29.97", "29.97"}, + {NULL, NULL} +}; + +value_map_t samplerate_xlat[] = +{ + {"Auto", "source"}, + {"22.05", "22.05"}, + {"24", "24"}, + {"32", "32"}, + {"44.1", "44.1"}, + {"48", "48"}, + {NULL, NULL} +}; + +value_map_t mix_xlat[] = +{ + {"Mono", "mono"}, + {"Stereo", "stereo"}, + {"Dolby Surround", "dpl1"}, + {"Dolby Pro Logic II", "dpl2"}, + {"6-channel discrete", "6ch"}, + {"AC3 Passthru", "none"}, + {NULL, NULL} +}; + +value_map_t deint_xlat[] = +{ + {"0", "off"}, + {"1", "custom"}, + {"2", "fast"}, + {"3", "slow"}, + {"4", "slower"}, + {NULL, NULL} +}; + +value_map_t denoise_xlat[] = +{ + {"0", "off"}, + {"1", "custom"}, + {"2", "weak"}, + {"3", "medium"}, + {"4", "strong"}, + {NULL, NULL} +}; + +value_map_t detel_xlat[] = +{ + {"0", "off"}, + {"1", "custom"}, + {"2", "default"}, + {NULL, NULL} +}; + +value_map_t decomb_xlat[] = +{ + {"0", "off"}, + {"1", "custom"}, + {"2", "default"}, + {NULL, NULL} +}; + +extern iso639_lang_t ghb_language_table[]; + +static GValue* +export_lang_xlat2(GValue *lin_val) +{ + GValue *gval; + + if (lin_val == NULL) return NULL; + gint ii; + gchar *str; + + str = ghb_value_string(lin_val); + for (ii = 0; ghb_language_table[ii].eng_name; ii++) + { + if (strcmp(str, ghb_language_table[ii].iso639_2) == 0) + { + const gchar *lang; + + if (ghb_language_table[ii].native_name[0] != 0) + lang = ghb_language_table[ii].native_name; + else + lang = ghb_language_table[ii].eng_name; + + gval = ghb_string_value_new(lang); + g_free(str); + return gval; + } + } + g_debug("Can't map language value: (%s)", str); + g_free(str); + return NULL; +} + +static GValue* +export_subtitle_xlat2(GValue *lin_val) +{ + gchar *str; + GValue *gval; + + if (lin_val == NULL) return NULL; + str = ghb_value_string(lin_val); + if (strcmp(str, "none") == 0) + { + gval = ghb_string_value_new("None"); + } + else if (strcmp(str, "auto") == 0) + { + gval = ghb_string_value_new("Autoselect"); + } + else + { + gval = export_lang_xlat2(lin_val); + } + g_free(str); + return gval; +} + +static GValue* +import_lang_xlat2(GValue *mac_val) +{ + GValue *gval; + + if (mac_val == NULL) return NULL; + gint ii; + gchar *str; + + str = ghb_value_string(mac_val); + for (ii = 0; ghb_language_table[ii].eng_name; ii++) + { + if ((strcmp(str, ghb_language_table[ii].eng_name) == 0) || + (strcmp(str, ghb_language_table[ii].native_name) == 0)) + { + gval = ghb_string_value_new(ghb_language_table[ii].iso639_2); + g_free(str); + return gval; + } + } + g_debug("Can't map language value: (%s)", str); + g_free(str); + return NULL; +} + +static GValue* +import_subtitle_xlat2(GValue *mac_val) +{ + gchar *str; + GValue *gval; + + if (mac_val == NULL) return NULL; + str = ghb_value_string(mac_val); + if (strcmp(str, "None") == 0) + { + gval = ghb_string_value_new("none"); + } + else if (strcmp(str, "Autoselect") == 0) + { + gval = ghb_string_value_new("auto"); + } + else + { + gval = import_lang_xlat2(mac_val); + } + g_free(str); + return gval; +} + +static GValue* +export_audio_track_xlat2(GValue *lin_val) +{ + gchar *str; + GValue *gval = NULL; + + if (lin_val == NULL) return NULL; + str = ghb_value_string(lin_val); + if (strcmp(str, "none") == 0) + { + gval = ghb_int_value_new(1); + } + else + { + gint val = ghb_value_int(lin_val) + 1; + gval = ghb_int_value_new(val); + } + g_free(str); + return gval; +} + +static GValue* +import_audio_track_xlat2(GValue *mac_val) +{ + gint val; + gchar *str; + GValue *gval; + + if (mac_val == NULL) return NULL; + val = ghb_value_int(mac_val); + if (val <= 0) + { + val = 0; + } + else + { + val--; + } + str = g_strdup_printf("%d", val); + gval = ghb_string_value_new(str); + g_free(str); + return gval; +} + +static GValue* +export_value_xlat2(value_map_t *value_map, GValue *lin_val, GType mac_type) +{ + GValue *gval; + + if (lin_val == NULL) return NULL; + gint ii; + gchar *str; + GValue *sval; + + str = ghb_value_string(lin_val); + for (ii = 0; value_map[ii].mac_val; ii++) + { + if (strcmp(str, value_map[ii].lin_val) == 0) + { + sval = ghb_string_value_new(value_map[ii].mac_val); + g_free(str); + gval = ghb_value_new(mac_type); + if (!g_value_transform(sval, gval)) + { + g_warning("can't transform"); + ghb_value_free(gval); + ghb_value_free(sval); + return NULL; + } + ghb_value_free(sval); + return gval; + } + } + g_debug("Can't map value: (%s)", str); + g_free(str); + return NULL; +} + +static void +export_value_xlat(GValue *dict) +{ + GValue *lin_val, *gval; + const gchar *key; + + key = "VideoEncoder"; + lin_val = ghb_dict_lookup(dict, key); + gval = export_value_xlat2(vcodec_xlat, lin_val, G_TYPE_STRING); + if (gval) + ghb_dict_insert(dict, g_strdup(key), gval); + key = "FileFormat"; + lin_val = ghb_dict_lookup(dict, key); + gval = export_value_xlat2(container_xlat, lin_val, G_TYPE_STRING); + if (gval) + ghb_dict_insert(dict, g_strdup(key), gval); + key = "VideoFramerate"; + lin_val = ghb_dict_lookup(dict, key); + gval = export_value_xlat2(framerate_xlat, lin_val, G_TYPE_STRING); + if (gval) + ghb_dict_insert(dict, g_strdup(key), gval); + key = "PictureDetelecine"; + lin_val = ghb_dict_lookup(dict, key); + gval = export_value_xlat2(detel_xlat, lin_val, G_TYPE_INT); + if (gval) + ghb_dict_insert(dict, g_strdup(key), gval); + key = "PictureDecomb"; + lin_val = ghb_dict_lookup(dict, key); + gval = export_value_xlat2(decomb_xlat, lin_val, G_TYPE_INT); + if (gval) + ghb_dict_insert(dict, g_strdup(key), gval); + key = "PictureDeinterlace"; + lin_val = ghb_dict_lookup(dict, key); + gval = export_value_xlat2(deint_xlat, lin_val, G_TYPE_INT); + if (gval) + ghb_dict_insert(dict, g_strdup(key), gval); + key = "PictureDenoise"; + lin_val = ghb_dict_lookup(dict, key); + gval = export_value_xlat2(denoise_xlat, lin_val, G_TYPE_INT); + if (gval) + ghb_dict_insert(dict, g_strdup(key), gval); + + GValue *slist; + GValue *sdict; + gint count, ii; + + slist = ghb_dict_lookup(dict, "SubtitleList"); + count = ghb_array_len(slist); + for (ii = 0; ii < count; ii++) + { + sdict = ghb_array_get_nth(slist, ii); + key = "SubtitleLanguage"; + lin_val = ghb_dict_lookup(sdict, key); + gval = export_subtitle_xlat2(lin_val); + if (gval) + ghb_dict_insert(sdict, g_strdup(key), gval); + } + + GValue *alist; + GValue *adict; + + alist = ghb_dict_lookup(dict, "AudioList"); + count = ghb_array_len(alist); + for (ii = 0; ii < count; ii++) + { + adict = ghb_array_get_nth(alist, ii); + key = "AudioTrack"; + lin_val = ghb_dict_lookup(adict, key); + gval = export_audio_track_xlat2(lin_val); + if (gval) + ghb_dict_insert(adict, g_strdup(key), gval); + key = "AudioEncoder"; + lin_val = ghb_dict_lookup(adict, key); + gval = export_value_xlat2(acodec_xlat, lin_val, G_TYPE_STRING); + if (gval) + ghb_dict_insert(adict, g_strdup(key), gval); + key = "AudioSamplerate"; + lin_val = ghb_dict_lookup(adict, key); + gval = export_value_xlat2(samplerate_xlat, lin_val, G_TYPE_STRING); + if (gval) + ghb_dict_insert(adict, g_strdup(key), gval); + key = "AudioMixdown"; + lin_val = ghb_dict_lookup(adict, key); + gval = export_value_xlat2(mix_xlat, lin_val, G_TYPE_STRING); + if (gval) + ghb_dict_insert(adict, g_strdup(key), gval); + } +} + + +static GValue* +import_value_xlat2( + GValue *defaults, + value_map_t *value_map, + const gchar *key, + GValue *mac_val) +{ + GValue *gval, *def_val; + + if (mac_val == NULL) return NULL; + def_val = ghb_dict_lookup(defaults, key); + if (def_val) + { + gint ii; + gchar *str; + GValue *sval; + + str = ghb_value_string(mac_val); + for (ii = 0; value_map[ii].mac_val; ii++) + { + if (strcmp(str, value_map[ii].mac_val) == 0) + { + sval = ghb_string_value_new(value_map[ii].lin_val); + g_free(str); + gval = ghb_value_new(G_VALUE_TYPE(def_val)); + if (!g_value_transform(sval, gval)) + { + g_warning("can't transform"); + ghb_value_free(gval); + ghb_value_free(sval); + return NULL; + } + ghb_value_free(sval); + return gval; + } + } + g_free(str); + } + else + { + gint ii; + gchar *str; + GValue *sval; + + str = ghb_value_string(mac_val); + for (ii = 0; value_map[ii].mac_val; ii++) + { + if (strcmp(str, value_map[ii].mac_val) == 0) + { + sval = ghb_string_value_new(value_map[ii].lin_val); + g_free(str); + gval = ghb_value_new(G_VALUE_TYPE(mac_val)); + if (!g_value_transform(sval, gval)) + { + g_warning("can't transform"); + ghb_value_free(gval); + ghb_value_free(sval); + return NULL; + } + ghb_value_free(sval); + return gval; + } + } + g_free(str); + } + return NULL; +} + +static void +import_value_xlat(GValue *dict) +{ + GValue *defaults, *mac_val, *gval; + const gchar *key; + + defaults = plist_get_dict(internalPlist, "Presets"); + key = "VideoEncoder"; + mac_val = ghb_dict_lookup(dict, key); + gval = import_value_xlat2(defaults, vcodec_xlat, key, mac_val); + if (gval) + ghb_dict_insert(dict, g_strdup(key), gval); + key = "FileFormat"; + mac_val = ghb_dict_lookup(dict, key); + gval = import_value_xlat2(defaults, container_xlat, key, mac_val); + if (gval) + ghb_dict_insert(dict, g_strdup(key), gval); + key = "VideoFramerate"; + mac_val = ghb_dict_lookup(dict, key); + gval = import_value_xlat2(defaults, framerate_xlat, key, mac_val); + if (gval) + ghb_dict_insert(dict, g_strdup(key), gval); + key = "PictureDetelecine"; + mac_val = ghb_dict_lookup(dict, key); + gval = import_value_xlat2(defaults, detel_xlat, key, mac_val); + if (gval) + ghb_dict_insert(dict, g_strdup(key), gval); + key = "PictureDecomb"; + mac_val = ghb_dict_lookup(dict, key); + gval = import_value_xlat2(defaults, decomb_xlat, key, mac_val); + if (gval) + ghb_dict_insert(dict, g_strdup(key), gval); + key = "PictureDeinterlace"; + mac_val = ghb_dict_lookup(dict, key); + gval = import_value_xlat2(defaults, deint_xlat, key, mac_val); + if (gval) + ghb_dict_insert(dict, g_strdup(key), gval); + key = "PictureDenoise"; + mac_val = ghb_dict_lookup(dict, key); + gval = import_value_xlat2(defaults, denoise_xlat, key, mac_val); + if (gval) + ghb_dict_insert(dict, g_strdup(key), gval); + + + GValue *sdeflist; + GValue *sdefaults; + GValue *slist; + GValue *sdict; + gint count, ii; + + sdeflist = ghb_dict_lookup(defaults, "SubtitleList"); + if (sdeflist) + { + slist = ghb_dict_lookup(dict, "SubtitleList"); + if (slist) + { + sdefaults = ghb_array_get_nth(sdeflist, 0); + count = ghb_array_len(slist); + for (ii = 0; ii < count; ii++) + { + sdict = ghb_array_get_nth(slist, ii); + key = "SubtitleLanguage"; + mac_val = ghb_dict_lookup(sdict, key); + gval = import_subtitle_xlat2(mac_val); + if (gval) + ghb_dict_insert(sdict, g_strdup(key), gval); + } + + } + else + { + key = "Subtitles"; + mac_val = ghb_dict_lookup(dict, key); + slist = ghb_array_value_new(8); + ghb_dict_insert(dict, g_strdup("SubtitleList"), slist); + if (mac_val) + { + gchar *lang; + + gval = import_subtitle_xlat2(mac_val); + lang = ghb_value_string(gval); + if (lang && strcasecmp(lang, "none") != 0 && !slist) + { + sdict = ghb_dict_value_new(); + ghb_array_append(slist, sdict); + ghb_dict_insert(sdict, g_strdup("SubtitleLanguage"), gval); + gval = ghb_dict_lookup(dict, "SubtitlesForced"); + if (gval != NULL) + { + ghb_dict_insert(sdict, g_strdup("SubtitleForced"), + ghb_value_dup(gval)); + } + else + { + ghb_dict_insert(sdict, g_strdup("SubtitleForced"), + ghb_boolean_value_new(FALSE)); + } + ghb_dict_insert(sdict, g_strdup("SubtitleBurned"), + ghb_boolean_value_new(TRUE)); + ghb_dict_insert(sdict, g_strdup("SubtitleDefaultTrack"), + ghb_boolean_value_new(FALSE)); + } + else + { + ghb_value_free(gval); + } + if (lang) + g_free(lang); + } + } + } + ghb_dict_remove(dict, "Subtitles"); + ghb_dict_remove(dict, "SubtitlesForced"); + + + GValue *alist; + GValue *adict; + GValue *adefaults; + GValue *adeflist; + + adeflist = ghb_dict_lookup(defaults, "AudioList"); + if (adeflist) + { + adefaults = ghb_array_get_nth(adeflist, 0); + alist = ghb_dict_lookup(dict, "AudioList"); + count = ghb_array_len(alist); + for (ii = 0; ii < count; ii++) + { + adict = ghb_array_get_nth(alist, ii); + key = "AudioTrack"; + mac_val = ghb_dict_lookup(adict, key); + gval = import_audio_track_xlat2(mac_val); + if (gval) + ghb_dict_insert(adict, g_strdup(key), gval); + key = "AudioEncoder"; + mac_val = ghb_dict_lookup(adict, key); + gval = import_value_xlat2(adefaults, acodec_xlat, key, mac_val); + if (gval) + ghb_dict_insert(adict, g_strdup(key), gval); + key = "AudioSamplerate"; + mac_val = ghb_dict_lookup(adict, key); + gval = import_value_xlat2(adefaults, samplerate_xlat, key, mac_val); + if (gval) + ghb_dict_insert(adict, g_strdup(key), gval); + key = "AudioMixdown"; + mac_val = ghb_dict_lookup(adict, key); + gval = import_value_xlat2(adefaults, mix_xlat, key, mac_val); + if (gval) + ghb_dict_insert(adict, g_strdup(key), gval); + + mac_val = ghb_dict_lookup(adict, "AudioTrackDRCSlider"); + if (mac_val != NULL) + { + gdouble drc; + drc = ghb_value_double(mac_val); + if (drc < 1.0 && drc > 0.0) + { + ghb_dict_insert(adict, g_strdup("AudioTrackDRCSlider"), + ghb_double_value_new(0.0)); + } + } + } + } +} + +static void +import_xlat_preset(GValue *dict) +{ + gboolean uses_max; + gint uses_pic; + gint par; + gint vqtype; + + g_debug("import_xlat_preset ()"); + uses_max = ghb_value_boolean( + preset_dict_get_value(dict, "UsesMaxPictureSettings")); + uses_pic = ghb_value_int( + preset_dict_get_value(dict, "UsesPictureSettings")); + par = ghb_value_int(preset_dict_get_value(dict, "PicturePAR")); + vqtype = ghb_value_int(preset_dict_get_value(dict, "VideoQualityType")); + + if (uses_max || uses_pic == 2) + { + ghb_dict_insert(dict, g_strdup("autoscale"), + ghb_boolean_value_new(TRUE)); + } + switch (par) + { + case 0: + { + if (ghb_dict_lookup(dict, "PictureModulus") == NULL) + ghb_dict_insert(dict, g_strdup("PictureModulus"), + ghb_int_value_new(16)); + } break; + case 1: + { + ghb_dict_insert(dict, g_strdup("PictureModulus"), + ghb_int_value_new(1)); + } break; + case 2: + { + if (ghb_dict_lookup(dict, "PictureModulus") == NULL) + ghb_dict_insert(dict, g_strdup("PictureModulus"), + ghb_int_value_new(16)); + } break; + default: + { + if (ghb_dict_lookup(dict, "PictureModulus") == NULL) + ghb_dict_insert(dict, g_strdup("PictureModulus"), + ghb_int_value_new(16)); + } break; + } + // VideoQualityType/0/1/2 - vquality_type_/target/bitrate/constant + switch (vqtype) + { + case 0: + { + ghb_dict_insert(dict, g_strdup("vquality_type_target"), + ghb_boolean_value_new(TRUE)); + ghb_dict_insert(dict, g_strdup("vquality_type_bitrate"), + ghb_boolean_value_new(FALSE)); + ghb_dict_insert(dict, g_strdup("vquality_type_constant"), + ghb_boolean_value_new(FALSE)); + } break; + case 1: + { + ghb_dict_insert(dict, g_strdup("vquality_type_target"), + ghb_boolean_value_new(FALSE)); + ghb_dict_insert(dict, g_strdup("vquality_type_bitrate"), + ghb_boolean_value_new(TRUE)); + ghb_dict_insert(dict, g_strdup("vquality_type_constant"), + ghb_boolean_value_new(FALSE)); + } break; + case 2: + { + ghb_dict_insert(dict, g_strdup("vquality_type_target"), + ghb_boolean_value_new(FALSE)); + ghb_dict_insert(dict, g_strdup("vquality_type_bitrate"), + ghb_boolean_value_new(FALSE)); + ghb_dict_insert(dict, g_strdup("vquality_type_constant"), + ghb_boolean_value_new(TRUE)); + } break; + default: + { + ghb_dict_insert(dict, g_strdup("vquality_type_target"), + ghb_boolean_value_new(FALSE)); + ghb_dict_insert(dict, g_strdup("vquality_type_bitrate"), + ghb_boolean_value_new(FALSE)); + ghb_dict_insert(dict, g_strdup("vquality_type_constant"), + ghb_boolean_value_new(TRUE)); + } break; + } + import_value_xlat(dict); + + gdouble vquality; + const GValue *gval; + + vquality = ghb_value_double(preset_dict_get_value(dict, "VideoQualitySlider")); + if (vquality > 0.0 && vquality < 1.0) + { + gint vcodec; + + gval = preset_dict_get_value(dict, "VideoEncoder"); + vcodec = ghb_lookup_combo_int("VideoEncoder", gval); + switch (vcodec) + { + case HB_VCODEC_X264: + { + vquality = 51. - vquality * 51.; + } break; + + case HB_VCODEC_FFMPEG: + { + vquality = 31. - vquality * 30.; + } break; + + case HB_VCODEC_THEORA: + { + vquality = vquality * 63.; + } break; + + default: + { + vquality = 0.; + } break; + } + ghb_dict_insert(dict, g_strdup("VideoQualitySlider"), + ghb_double_value_new(vquality)); + } +} + +static void +import_xlat_presets(GValue *presets) +{ + gint count, ii; + GValue *dict; + gboolean folder; + + g_debug("import_xlat_presets ()"); + if (presets == NULL) return; + count = ghb_array_len(presets); + for (ii = 0; ii < count; ii++) + { + dict = ghb_array_get_nth(presets, ii); + folder = ghb_value_boolean(preset_dict_get_value(dict, "Folder")); + if (folder) + { + GValue *nested; + + nested = ghb_dict_lookup(dict, "ChildrenArray"); + import_xlat_presets(nested); + } + else + { + import_xlat_preset(dict); + } + } +} + +static void +export_xlat_preset(GValue *dict) +{ + gboolean autoscale, target, br, constant; + + g_debug("export_xlat_prest ()"); + autoscale = ghb_value_boolean(preset_dict_get_value(dict, "autoscale")); + target = ghb_value_boolean( + preset_dict_get_value(dict, "vquality_type_target")); + br = ghb_value_boolean( + preset_dict_get_value(dict, "vquality_type_bitrate")); + constant = ghb_value_boolean( + preset_dict_get_value(dict, "vquality_type_constant")); + + if (autoscale) + ghb_dict_insert(dict, g_strdup("UsesPictureSettings"), + ghb_int_value_new(2)); + else + ghb_dict_insert(dict, g_strdup("UsesPictureSettings"), + ghb_int_value_new(1)); + + // VideoQualityType/0/1/2 - vquality_type_/target/bitrate/constant + if (target) + { + ghb_dict_insert(dict, g_strdup("VideoQualityType"), + ghb_int_value_new(0)); + } + else if (br) + { + ghb_dict_insert(dict, g_strdup("VideoQualityType"), + ghb_int_value_new(1)); + } + else if (constant) + { + ghb_dict_insert(dict, g_strdup("VideoQualityType"), + ghb_int_value_new(2)); + } + + GValue *alist, *adict; + gint count, ii; + + alist = ghb_dict_lookup(dict, "AudioList"); + count = ghb_array_len(alist); + for (ii = 0; ii < count; ii++) { - presets = ghb_dict_lookup(dict, "preset_folder"); - ghb_presets_list_init(ud, presets, preset, iter); + gdouble drc; + + adict = ghb_array_get_nth(alist, ii); + drc = ghb_value_double( + preset_dict_get_value(adict, "AudioTrackDRCSlider")); + if (drc < 1.0 && drc > 0.0) + { + ghb_dict_insert(adict, g_strdup("AudioTrackDRCSlider"), + ghb_double_value_new(0.0)); + } } - g_free(def_preset); + + ghb_dict_remove(dict, "UsesMaxPictureSettings"); + ghb_dict_remove(dict, "autoscale"); + ghb_dict_remove(dict, "vquality_type_target"); + ghb_dict_remove(dict, "vquality_type_bitrate"); + ghb_dict_remove(dict, "vquality_type_constant"); + export_value_xlat(dict); } static void -presets_list_insert( - signal_user_data_t *ud, - GValue *presets, - const gchar *parent_name, - GtkTreeIter *parent, - gint pos) +export_xlat_presets(GValue *presets) { - GtkTreeView *treeview; - GtkTreeIter iter; - GtkTreeStore *store; - const gchar *preset; - gchar *def_preset, *def_folder; - const gchar *description; - gint flags, custom; - gboolean def; - gint count; + gint count, ii; GValue *dict; - - g_debug("presets_list_insert ()"); + gboolean folder; + + if (presets == NULL) return; count = ghb_array_len(presets); - if (pos >= count) - return; - def_folder = ghb_settings_get_string(ud->settings, "default_folder"); - def_preset = ghb_settings_get_string(ud->settings, "default_preset"); - treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "presets_list")); - store = GTK_TREE_STORE(gtk_tree_view_get_model(treeview)); - // Additional settings, add row - dict = ghb_array_get_nth(presets, pos); - preset = preset_get_name(dict); - def = FALSE; - if (strcmp(preset, def_preset) == 0) + for (ii = 0; ii < count; ii++) { - if (parent_name && strcmp(parent_name, def_folder) == 0) - def = TRUE; - else if (parent_name == NULL && def_folder[0] == 0) - def = TRUE; - } + dict = ghb_array_get_nth(presets, ii); + folder = ghb_value_boolean(preset_dict_get_value(dict, "Folder")); + if (folder) + { + GValue *nested; - description = ghb_presets_get_description(dict); - gtk_tree_store_insert(store, &iter, parent, pos); - flags = ghb_preset_flags(dict); - custom = flags & PRESETS_CUST; - gtk_tree_store_set(store, &iter, 0, preset, - 1, def ? 800 : 400, - 2, def ? 2 : 0, - 3, custom ? "black" : "blue", - 4, description, - -1); - if (flags & PRESETS_FOLDER) - { - presets = ghb_dict_lookup(dict, "preset_folder"); - ghb_presets_list_init(ud, presets, preset, &iter); + nested = ghb_dict_lookup(dict, "ChildrenArray"); + export_xlat_presets(nested); + } + else + { + export_xlat_preset(dict); + } } - g_free(def_preset); +} + +static guint prefs_timeout_id = 0; + +static gboolean +delayed_store_prefs(gpointer data) +{ + store_plist(prefsPlist, "preferences"); + prefs_timeout_id = 0; + return FALSE; } static void -presets_list_remove( - signal_user_data_t *ud, - gint folder_pos, - gint pos) +store_presets() { - GtkTreeView *treeview; - GtkTreeIter iter, piter; - GtkTreeStore *store; - - g_debug("presets_list_remove ()"); - treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "presets_list")); - store = GTK_TREE_STORE(gtk_tree_view_get_model(treeview)); - if (folder_pos >= 0) - { - if (gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &piter, - NULL, folder_pos)) - { - if (pos >= 0) - { - if (gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &iter, - &piter, pos)) - { - gtk_tree_store_remove(store, &iter); - } - } - else - { - gtk_tree_store_remove(store, &piter); - } - } - } - else if (pos >= 0) + GValue *export; + + export = ghb_value_dup(presetsPlist); + export_xlat_presets(export); + store_plist(export, "presets"); + ghb_value_free(export); +} + +static void +store_prefs(void) +{ + if (prefs_timeout_id != 0) { - if (gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &iter, - NULL, pos)) - { - gtk_tree_store_remove(store, &iter); - } + GMainContext *mc; + GSource *source; + + mc = g_main_context_default(); + source = g_main_context_find_source_by_id(mc, prefs_timeout_id); + if (source != NULL) + g_source_destroy(source); } + prefs_timeout_id = g_timeout_add_seconds(1, (GSourceFunc)delayed_store_prefs, NULL); } void @@ -1187,147 +2872,200 @@ ghb_presets_reload(signal_user_data_t *ud) { GValue *std_presets; gint count, ii; + int *indices, len; g_debug("ghb_presets_reload()\n"); std_presets = ghb_resource_get("standard-presets"); if (std_presets == NULL) return; + remove_std_presets(ud); + indices = presets_find_default(presetsPlist, &len); + if (indices) + { + presets_clear_default(std_presets); + g_free(indices); + } // Merge the keyfile contents into our presets count = ghb_array_len(std_presets); - for (ii = 0; ii < count; ii++) + for (ii = count-1; ii >= 0; ii--) { - const gchar *name; GValue *std_dict; GValue *copy_dict; - GHashTableIter iter; - gchar *key; - GValue *value; - gint folder_pos, pos; + gint indices = 0; std_dict = ghb_array_get_nth(std_presets, ii); - name = preset_get_name(std_dict); - if (ghb_presets_find(presetsPlist, NULL, name, &folder_pos, &pos)) - { - if (ghb_presets_remove(presetsPlist, folder_pos, pos)) - { - presets_list_remove(ud, folder_pos, pos); - } - } - copy_dict = ghb_dict_value_new(); - pos = presets_find_pos(presetsPlist, name, 0); - ghb_array_insert(presetsPlist, pos, copy_dict); - ghb_dict_iter_init(&iter, std_dict); - // middle (void*) cast prevents gcc warning "defreferencing type-punned - // pointer will break strict-aliasing rules" - while (g_hash_table_iter_next( - &iter, (gpointer*)(void*)&key, (gpointer*)(void*)&value)) - { - ghb_dict_insert(copy_dict, g_strdup(key), ghb_value_dup(value)); - } - presets_list_insert(ud, presetsPlist, NULL, NULL, pos); + copy_dict = ghb_value_dup(std_dict); + ghb_dict_insert(copy_dict, g_strdup("PresetBuildNumber"), + ghb_int64_value_new(hb_get_build(NULL))); + ghb_presets_insert(presetsPlist, copy_dict, &indices, 1); + presets_list_insert(ud, &indices, 1); } - store_plist(presetsPlist, "presets"); + import_xlat_presets(presetsPlist); + store_presets(); } -void -ghb_save_queue(GValue *queue) +static gboolean +check_old_presets() { - store_plist(queue, "queue"); + gint count, ii; + + count = ghb_array_len(presetsPlist); + for (ii = count-1; ii >= 0; ii--) + { + GValue *dict; + GValue *type; + + dict = ghb_array_get_nth(presetsPlist, ii); + type = ghb_dict_lookup(dict, "Type"); + if (type == NULL) + return TRUE; + } + return FALSE; } -GValue* -ghb_load_queue() +static void +replace_standard_presets() { - return load_plist("queue"); + GValue *std_presets; + int *indices, len; + gint count, ii; + + count = ghb_array_len(presetsPlist); + for (ii = count-1; ii >= 0; ii--) + { + GValue *dict; + gint ptype; + + dict = ghb_array_get_nth(presetsPlist, ii); + ptype = ghb_value_int(preset_dict_get_value(dict, "Type")); + if (ptype == PRESETS_BUILTIN) + { + gint indices = 0; + ghb_presets_remove(presetsPlist, &indices, 1); + } + } + + std_presets = ghb_resource_get("standard-presets"); + if (std_presets == NULL) return; + + indices = presets_find_default(presetsPlist, &len); + if (indices) + { + presets_clear_default(std_presets); + g_free(indices); + } + // Merge the keyfile contents into our presets + count = ghb_array_len(std_presets); + for (ii = count-1; ii >= 0; ii--) + { + GValue *std_dict; + GValue *copy_dict; + gint indices = 0; + + std_dict = ghb_array_get_nth(std_presets, ii); + copy_dict = ghb_value_dup(std_dict); + ghb_dict_insert(copy_dict, g_strdup("PresetBuildNumber"), + ghb_int64_value_new(hb_get_build(NULL))); + ghb_presets_insert(presetsPlist, copy_dict, &indices, 1); + } + import_xlat_presets(presetsPlist); + store_presets(); } -void -ghb_remove_queue_file() +static void +update_standard_presets(signal_user_data_t *ud) { - remove_plist("queue"); + gint count, ii; + + count = ghb_array_len(presetsPlist); + for (ii = count-1; ii >= 0; ii--) + { + GValue *dict; + const GValue *gval; + gint64 build; + gint type; + + dict = ghb_array_get_nth(presetsPlist, ii); + gval = ghb_dict_lookup(dict, "Type"); + if (gval == NULL) + { + // Old preset that doesn't have a Type + replace_standard_presets(); + return; + } + + type = ghb_value_int(gval); + if (type == 0) + { + gval = ghb_dict_lookup(dict, "PresetBuildNumber"); + if (gval == NULL) + { + // Old preset that doesn't have a build number + replace_standard_presets(); + return; + } + + build = ghb_value_int64(gval); + if (build != hb_get_build(NULL)) + { + // Build number does not match + replace_standard_presets(); + return; + } + } + } + return; } void -ghb_presets_load() +ghb_presets_load(signal_user_data_t *ud) { presetsPlist = load_plist("presets"); if (presetsPlist == NULL) { presetsPlist = ghb_value_dup(ghb_resource_get("standard-presets")); - store_plist(presetsPlist, "presets"); + import_xlat_presets(presetsPlist); + store_presets(); } - if (G_VALUE_TYPE(presetsPlist) == ghb_dict_get_type()) + else if (G_VALUE_TYPE(presetsPlist) == ghb_dict_get_type()) { // Presets is older dictionary format. Convert to array - GHashTableIter old_iter; - GValue *presets; - gchar *name; - GValue *orig_dict; - - presets = ghb_array_value_new(32); - ghb_dict_iter_init(&old_iter, presetsPlist); - // middle (void*) cast prevents gcc warning "defreferencing type-punned - // pointer will break strict-aliasing rules" - while (g_hash_table_iter_next( - &old_iter, (gpointer*)(void*)&name, (gpointer*)(void*)&orig_dict)) - { - GHashTableIter iter; - gchar *key; - GValue *value, *dict; - - dict = ghb_dict_value_new(); - ghb_dict_insert(dict, g_strdup("preset_name"), - ghb_string_value_new(name)); - ghb_array_append(presets, dict); - ghb_dict_iter_init(&iter, orig_dict); - // middle (void*) cast prevents gcc warning "defreferencing - // type-punned pointer will break strict-aliasing rules" - while (g_hash_table_iter_next( - &iter, (gpointer*)(void*)&key, (gpointer*)(void*)&value)) - { - ghb_dict_insert(dict, g_strdup(key), ghb_value_dup(value)); - } - } ghb_value_free(presetsPlist); - presetsPlist = presets; - store_plist(presetsPlist, "presets"); + presetsPlist = ghb_value_dup(ghb_resource_get("standard-presets")); + import_xlat_presets(presetsPlist); + store_presets(); + } + else if (check_old_presets()) + { + ghb_value_free(presetsPlist); + presetsPlist = ghb_value_dup(ghb_resource_get("standard-presets")); + import_xlat_presets(presetsPlist); + store_presets(); } + update_standard_presets(ud); + import_xlat_presets(presetsPlist); } static void -settings_save(signal_user_data_t *ud, const gchar *folder, const gchar *name) +settings_save(signal_user_data_t *ud, const GValue *path) { GValue *dict, *internal; GHashTableIter iter; gchar *key; GValue *value; gboolean autoscale; - gint folder_pos, pos; + gint *indices, len, count; + gint *def_indices, def_len; + const gchar *name; + gboolean replace = FALSE; + g_debug("settings_save"); if (internalPlist == NULL) return; - if (ghb_settings_get_boolean(ud->settings, "allow_tweaks")) - { - gchar *str; - str = ghb_settings_get_string(ud->settings, "tweak_deinterlace"); - if (str) - { - ghb_settings_set_string(ud->settings, "deinterlace", str); - g_free(str); - } - str = ghb_settings_get_string(ud->settings, "tweak_denoise"); - if (str) - { - ghb_settings_set_string(ud->settings, "denoise", str); - g_free(str); - } - } - autoscale = ghb_settings_get_boolean(ud->settings, "autoscale"); - ghb_settings_set_int64(ud->settings, "preset_type", PRESETS_CUST); - - dict = ghb_dict_value_new(); - if (ghb_presets_find(presetsPlist, folder, name, &folder_pos, &pos)) + count = ghb_array_len(path); + name = g_value_get_string(ghb_array_get_nth(path, count-1)); + indices = ghb_preset_indices_from_path(presetsPlist, path, &len); + if (indices) { - if (ghb_presets_get_type(presetsPlist, folder_pos, pos) & - PRESETS_FOLDER) + if (ghb_presets_get_folder(presetsPlist, indices, len)) { gchar *message; message = g_strdup_printf( @@ -1338,15 +3076,28 @@ settings_save(signal_user_data_t *ud, const gchar *folder, const gchar *name) g_free(message); return; } - ghb_presets_replace(presetsPlist, dict, folder_pos, pos); - pos = -1; + dict = ghb_dict_value_new(); + ghb_presets_replace(presetsPlist, dict, indices, len); + replace = TRUE; } else { - pos = presets_find_pos(presetsPlist, name, 1); - ghb_array_insert(presetsPlist, pos, dict); + indices = presets_find_pos(path, PRESETS_CUSTOM, &len); + if (indices) + { + dict = ghb_dict_value_new(); + ghb_presets_insert(presetsPlist, dict, indices, len); + } + else + { + g_warning("failed to find insert path"); + return; + } } - ghb_dict_insert(dict, g_strdup("preset_name"), ghb_string_value_new(name)); + current_preset = dict; + autoscale = ghb_settings_get_boolean(ud->settings, "autoscale"); + ghb_settings_set_int64(ud->settings, "Type", PRESETS_CUSTOM); + ghb_settings_set_int64(ud->settings, "PresetBuildNumber", hb_get_build(NULL)); internal = plist_get_dict(internalPlist, "Presets"); ghb_dict_iter_init(&iter, internal); @@ -1361,11 +3112,11 @@ settings_save(signal_user_data_t *ud, const gchar *folder, const gchar *name) key2 = key; if (!autoscale) { - if (strcmp(key, "max_width") == 0) + if (strcmp(key, "PictureWidth") == 0) { key2 = "scale_width"; } - else if (strcmp(key, "max_height") == 0) + else if (strcmp(key, "PictureHeight") == 0) { key2 = "scale_height"; } @@ -1373,35 +3124,66 @@ settings_save(signal_user_data_t *ud, const gchar *folder, const gchar *name) gval = ghb_settings_get_value(ud->settings, key2); if (gval == NULL) { - g_debug("Setting (%s) is not in defaults\n", (gchar*)key); continue; } - if (ghb_value_cmp(gval, value) != 0) + ghb_dict_insert(dict, g_strdup(key), ghb_value_dup(gval)); + } + internal = plist_get_dict(internalPlist, "XlatPresets"); + ghb_dict_iter_init(&iter, internal); + // middle (void*) cast prevents gcc warning "defreferencing type-punned + // pointer will break strict-aliasing rules" + while (g_hash_table_iter_next( + &iter, (gpointer*)(void*)&key, (gpointer*)(void*)&value)) + { + const GValue *gval; + + gval = ghb_settings_get_value(ud->settings, key); + if (gval == NULL) { - // Differs from default value. Store it. - ghb_dict_insert(dict, g_strdup(key), ghb_value_dup(gval)); + continue; + } + ghb_dict_insert(dict, g_strdup(key), ghb_value_dup(gval)); + } + ghb_dict_insert(dict, g_strdup("PresetName"), ghb_string_value_new(name)); + if (replace) + { + def_indices = presets_find_default(presetsPlist, &def_len); + if (def_indices != NULL && + preset_path_cmp(indices, len, def_indices, def_len) != 0) + { + ghb_dict_insert(dict, g_strdup("Default"), + ghb_boolean_value_new(FALSE)); } + presets_list_update_item(ud, indices, len, FALSE); + } + else + { + ghb_dict_insert(dict, g_strdup("Default"), + ghb_boolean_value_new(FALSE)); + presets_list_insert(ud, indices, len); } - if (pos >= 0) - presets_list_insert(ud, presetsPlist, NULL, NULL, pos); - store_plist(presetsPlist, "presets"); + store_presets(); ud->dont_clear_presets = TRUE; - ghb_set_preset (ud, NULL, name); + // Make the new preset the selected item + ghb_select_preset2(ud->builder, indices, len); + g_free(indices); ud->dont_clear_presets = FALSE; return; } static void -folder_save(signal_user_data_t *ud, const gchar *name) +folder_save(signal_user_data_t *ud, const GValue *path) { GValue *dict, *folder; - gint folder_pos, pos; - + gint *indices, len, count; + const gchar *name; - if (ghb_presets_find(presetsPlist, name, NULL, &folder_pos, &pos)) + count = ghb_array_len(path); + name = g_value_get_string(ghb_array_get_nth(path, count-1)); + indices = ghb_preset_indices_from_path(presetsPlist, path, &len); + if (indices) { - if (!(ghb_presets_get_type(presetsPlist, folder_pos, pos) & - PRESETS_FOLDER)) + if (!ghb_presets_get_folder(presetsPlist, indices, len)) { gchar *message; message = g_strdup_printf( @@ -1410,35 +3192,46 @@ folder_save(signal_user_data_t *ud, const gchar *name) name); ghb_message_dialog(GTK_MESSAGE_ERROR, message, "Cancel", NULL); g_free(message); + g_free(indices); return; } // Already exists, update its description - dict = presets_get_dict(presetsPlist, folder_pos, pos); - ghb_dict_insert(dict, g_strdup("preset_description"), + dict = presets_get_dict(presetsPlist, indices, len); + ghb_dict_insert(dict, g_strdup("PresetDescription"), ghb_value_dup(preset_dict_get_value( - ud->settings, "preset_description"))); + ud->settings, "PresetDescription"))); + presets_list_update_item(ud, indices, len, FALSE); + g_free(indices); + store_presets(); return; } else { - dict = ghb_dict_value_new(); - pos = presets_find_pos(presetsPlist, name, 1); - ghb_array_insert(presetsPlist, pos, dict); + indices = presets_find_pos(path, PRESETS_CUSTOM, &len); + if (indices) + { + dict = ghb_dict_value_new(); + ghb_presets_insert(presetsPlist, dict, indices, len); + } + else + { + g_warning("failed to find insert path"); + return; + } } - ghb_dict_insert(dict, g_strdup("preset_description"), + ghb_dict_insert(dict, g_strdup("PresetDescription"), ghb_value_dup(preset_dict_get_value( - ud->settings, "preset_description"))); - ghb_dict_insert(dict, g_strdup("preset_name"), ghb_string_value_new(name)); + ud->settings, "PresetDescription"))); + ghb_dict_insert(dict, g_strdup("PresetName"), ghb_string_value_new(name)); folder = ghb_array_value_new(8); - ghb_dict_insert(dict, g_strdup("preset_folder"), folder); - ghb_dict_insert(dict, g_strdup("preset_type"), - ghb_int64_value_new(PRESETS_FOLDER|PRESETS_CUST)); - - presets_list_insert(ud, presetsPlist, NULL, NULL, pos); - store_plist(presetsPlist, "presets"); - ud->dont_clear_presets = TRUE; - ghb_set_preset (ud, NULL, name); - ud->dont_clear_presets = FALSE; + ghb_dict_insert(dict, g_strdup("ChildrenArray"), folder); + ghb_dict_insert(dict, g_strdup("Type"), + ghb_int64_value_new(PRESETS_CUSTOM)); + ghb_dict_insert(dict, g_strdup("Folder"), ghb_boolean_value_new(TRUE)); + + presets_list_insert(ud, indices, len); + g_free(indices); + store_presets(); return; } @@ -1446,279 +3239,444 @@ void ghb_presets_list_default(signal_user_data_t *ud) { GtkTreeView *treeview; - GtkTreeIter iter, citer; + GtkTreePath *treepath; + GtkTreeIter iter; GtkTreeStore *store; - gboolean done; - gchar *preset; - gchar *def_preset, *def_folder; - gint def, weight; + gint *indices, len; g_debug("ghb_presets_list_default ()"); - def_folder = ghb_settings_get_string(ud->settings, "default_folder"); - def_preset = ghb_settings_get_string(ud->settings, "default_preset"); treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "presets_list")); store = GTK_TREE_STORE(gtk_tree_view_get_model(treeview)); - if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store), &iter)) + indices = presets_find_default(presetsPlist, &len); + if (indices == NULL) return; + treepath = ghb_tree_path_new_from_indices(indices, len); + if (treepath) { - if (def_folder[0] != 0) + if (gtk_tree_model_get_iter(GTK_TREE_MODEL(store), &iter, treepath)) { - gboolean found = FALSE; - do - { - gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, - 0, &preset, 1, &weight, -1); - if (strcmp(preset, def_folder) == 0) - { - if (gtk_tree_model_iter_children( - GTK_TREE_MODEL(store), &citer, &iter)) - { - iter = citer; - found = TRUE; - } - g_free(preset); - break; - } - g_free(preset); - done = !gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter); - } while (!done); - if (!found) return; - } - do - { - def = FALSE; - gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, - 0, &preset, 1, &weight, -1); - if (strcmp(preset, def_preset) == 0) - def = TRUE; - if ((!def && weight == 800) || def) - { - gtk_tree_store_set(store, &iter, - 1, def ? 800 : 400, - 2, def ? 2 : 0, - -1); - } - g_free(preset); - done = !gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter); - } while (!done); + gtk_tree_store_set(store, &iter, + 1, 800, + 2, 2 , + -1); + } + gtk_tree_path_free(treepath); } - g_free(def_folder); - g_free(def_preset); + g_free(indices); } void ghb_presets_list_clear_default(signal_user_data_t *ud) { GtkTreeView *treeview; - GtkTreeIter iter, piter; + GtkTreePath *treepath; + GtkTreeIter iter; GtkTreeStore *store; - gchar *def_preset, *def_folder; - gint folder_pos, pos; - gboolean found = FALSE; + gint *indices, len; - g_debug("ghb_presets_list_default ()"); - def_folder = ghb_settings_get_string(ud->settings, "default_folder"); - def_preset = ghb_settings_get_string(ud->settings, "default_preset"); + g_debug("ghb_presets_list_clear_default ()"); treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "presets_list")); store = GTK_TREE_STORE(gtk_tree_view_get_model(treeview)); - if (!ghb_presets_find(presetsPlist, def_folder, def_preset, - &folder_pos, &pos)) + indices = presets_find_default(presetsPlist, &len); + if (indices == NULL) return; + treepath = ghb_tree_path_new_from_indices(indices, len); + if (treepath) { - return; + if (gtk_tree_model_get_iter(GTK_TREE_MODEL(store), &iter, treepath)) + { + gtk_tree_store_set(store, &iter, + 1, 400, + 2, 0 , + -1); + } + gtk_tree_path_free(treepath); + } + g_free(indices); +} + +static void +update_audio_presets(signal_user_data_t *ud) +{ + g_debug("update_audio_presets"); + const GValue *audio_list; + + audio_list = ghb_settings_get_value(ud->settings, "audio_list"); + ghb_settings_set_value(ud->settings, "AudioList", audio_list); +} + +static void +update_subtitle_presets(signal_user_data_t *ud) +{ + g_debug("update_subtitle_presets"); + const GValue *subtitle_list, *subtitle; + GValue *slist, *dict; + gint count, ii, source; + + subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list"); + slist = ghb_array_value_new(8); + count = ghb_array_len(subtitle_list); + for (ii = 0; ii < count; ii++) + { + subtitle = ghb_array_get_nth(subtitle_list, ii); + source = ghb_settings_get_int(subtitle, "SubtitleSource"); + if (source != SRTSUB) + { + dict = ghb_value_dup(subtitle); + ghb_array_append(slist, dict); + } + } + ghb_settings_take_value(ud->settings, "SubtitleList", slist); +} + +G_MODULE_EXPORT void +presets_menu_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud) +{ + GtkMenu *menu; + + menu = GTK_MENU(GHB_WIDGET(ud->builder, "presets_menu")); + gtk_menu_popup(menu, NULL, NULL, NULL, NULL, 1, + gtk_get_current_event_time()); +} + +G_MODULE_EXPORT void +preset_import_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud) +{ + GtkWidget *dialog; + GtkResponseType response; + gchar *exportDir; + gchar *filename; + GtkFileFilter *filter; + + g_debug("preset_import_clicked_cb ()"); + + dialog = gtk_file_chooser_dialog_new("Import Preset", NULL, + GTK_FILE_CHOOSER_ACTION_OPEN, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, + NULL); + + filter = gtk_file_filter_new(); + gtk_file_filter_set_name(filter, "All (*)"); + gtk_file_filter_add_pattern(filter, "*"); + gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filter); + + filter = gtk_file_filter_new(); + gtk_file_filter_set_name(filter, "Presets (*.plist)"); + gtk_file_filter_add_pattern(filter, "*.plist"); + gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filter); + gtk_file_chooser_set_filter(GTK_FILE_CHOOSER(dialog), filter); + + exportDir = ghb_settings_get_string(ud->settings, "ExportDirectory"); + if (exportDir == NULL || exportDir[0] == '\0') + { + exportDir = g_strdup("."); } - // de-emphasize the current default - if (folder_pos >= 0) + gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), exportDir); + g_free(exportDir); + + response = gtk_dialog_run(GTK_DIALOG(dialog)); + gtk_widget_hide(dialog); + if (response == GTK_RESPONSE_ACCEPT) { - if (gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &piter, - NULL, folder_pos)) + GValue *dict, *array; + gchar *dir; + gint count, ii; + + filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog)); + + // import the preset + if (!g_file_test(filename, G_FILE_TEST_IS_REGULAR)) { - if (pos >= 0) - { - if (gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &iter, - &piter, pos)) - { - found = TRUE; - } - } - else + gtk_widget_destroy(dialog); + g_free(filename); + return; + } + array = ghb_plist_parse_file(filename); + + import_xlat_presets(array); + presets_clear_default(array); + presets_customize(array); + + count = ghb_array_len(array); + for (ii = 0; ii < count; ii++) + { + GValue *path, *name; + gint *indices, len; + gint index = 1; + + dict = ghb_array_get_nth(array, ii); + path = ghb_array_value_new(1); + name = ghb_value_dup(ghb_dict_lookup(dict, "PresetName")); + ghb_array_append(path, name); + indices = ghb_preset_indices_from_path(presetsPlist, path, &len); + // Modify the preset name till we make it unique + while (indices != NULL) { - found = TRUE; + gchar *str = ghb_value_string(name); + + ghb_value_free(path); + g_free(indices); + + str = g_strdup_printf("%s %d", str, index); + path = ghb_array_value_new(1); + name = ghb_string_value_new(str); + ghb_array_append(path, name); + g_free(str); + + index++; + indices = ghb_preset_indices_from_path(presetsPlist, path, &len); } + ghb_dict_insert(dict, g_strdup("PresetName"), ghb_value_dup(name)); + indices = presets_find_pos(path, PRESETS_CUSTOM, &len); + ghb_presets_insert(presetsPlist, ghb_value_dup(dict), indices, len); + presets_list_insert(ud, indices, len); + ghb_value_free(path); } - } - else if (pos >= 0) - { - if (gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &iter, - NULL, pos)) + ghb_value_free(array); + + exportDir = ghb_settings_get_string(ud->settings, "ExportDirectory"); + dir = g_path_get_dirname(filename); + if (strcmp(dir, exportDir) != 0) { - found = TRUE; + ghb_settings_set_string(ud->settings, "ExportDirectory", dir); + ghb_pref_save(ud->settings, "ExportDirectory"); } + g_free(filename); + g_free(exportDir); + g_free(dir); + store_presets(); } - if (found) - { - gtk_tree_store_set(store, &iter, - 1, 400, - 2, 0, - -1); - } - g_free(def_folder); - g_free(def_preset); + gtk_widget_destroy(dialog); } -static void -ghb_select_preset2( - GtkBuilder *builder, - gint folder_pos, - gint pos) +G_MODULE_EXPORT void +preset_export_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud) { - GtkTreeView *treeview; - GtkTreeSelection *selection; - GtkTreeModel *store; - GtkTreeIter iter; - GtkTreePath *path; - - g_debug("ghb_select_preset2() (%d) (%d)", folder_pos, pos); - treeview = GTK_TREE_VIEW(GHB_WIDGET(builder, "presets_list")); - selection = gtk_tree_view_get_selection (treeview); - store = gtk_tree_view_get_model (treeview); - if (folder_pos == -1) - { - folder_pos = pos; - pos = -1; - } - path = gtk_tree_path_new_from_indices(folder_pos, pos, -1); - if (gtk_tree_model_get_iter(store, &iter, path)) + GtkWidget *dialog; + GtkResponseType response; + GValue *preset; + const gchar *name = ""; + gint count, *indices, len; + gchar *exportDir; + gchar *filename; + + g_debug("preset_export_clicked_cb ()"); + preset = ghb_settings_get_value (ud->settings, "preset_selection"); + if (preset == NULL) + return; + + count = ghb_array_len(preset); + if (count <= 0) + return; + + name = g_value_get_string(ghb_array_get_nth(preset, count-1)); + + dialog = gtk_file_chooser_dialog_new("Export Preset", NULL, + GTK_FILE_CHOOSER_ACTION_SAVE, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, + NULL); + + exportDir = ghb_settings_get_string(ud->settings, "ExportDirectory"); + if (exportDir == NULL || exportDir[0] == '\0') { - gtk_tree_selection_select_iter (selection, &iter); + exportDir = g_strdup("."); } - else + filename = g_strdup_printf("%s.plist", name); + gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), exportDir); + gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dialog), filename); + g_free(filename); + g_free(exportDir); + + indices = ghb_preset_indices_from_path(presetsPlist, preset, &len); + if (indices == NULL) + return; + + response = gtk_dialog_run(GTK_DIALOG(dialog)); + gtk_widget_hide(dialog); + if (response == GTK_RESPONSE_ACCEPT) { - gtk_tree_model_get_iter_first(store, &iter); - gtk_tree_selection_select_iter (selection, &iter); - } - gtk_tree_path_free(path); -} + GValue *export, *dict, *array; + FILE *file; + gchar *dir; -void -ghb_select_preset(GtkBuilder *builder, const gchar *folder, const gchar *preset) -{ - gint folder_pos, pos; + filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog)); - g_debug("ghb_select_preset() (%s) (%s)", folder, preset); - if (ghb_presets_find(presetsPlist, folder, preset, &folder_pos, &pos)) - { - ghb_select_preset2(builder, folder_pos, pos); + // export the preset + dict = presets_get_dict(presetsPlist, indices, len); + + export = ghb_value_dup(dict); + array = ghb_array_value_new(1); + ghb_array_append(array, export); + presets_clear_default(array); + presets_customize(array); + export_xlat_presets(array); + + file = g_fopen(filename, "w"); + if (file != NULL) + { + ghb_plist_write(file, array); + fclose(file); + } + ghb_value_free(array); + + exportDir = ghb_settings_get_string(ud->settings, "ExportDirectory"); + dir = g_path_get_dirname(filename); + if (strcmp(dir, exportDir) != 0) + { + ghb_settings_set_string(ud->settings, "ExportDirectory", dir); + ghb_pref_save(ud->settings, "ExportDirectory"); + } + g_free(exportDir); + g_free(dir); + g_free(filename); } + gtk_widget_destroy(dialog); + g_free(indices); } -static void -update_audio_presets(signal_user_data_t *ud) +G_MODULE_EXPORT void +presets_new_folder_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud) { - g_debug("update_audio_presets"); - const GValue *audio_list; + GtkWidget *dialog; + GtkEntry *entry; + GtkTextView *desc; + GtkResponseType response; + GValue *preset, *dict; + const gchar *name = ""; + const gchar *description = ""; + gint count, *indices, len; - audio_list = ghb_settings_get_value(ud->settings, "audio_list"); - ghb_settings_set_value(ud->settings, "pref_audio_list", audio_list); -} + g_debug("presets_save_clicked_cb ()"); + preset = ghb_settings_get_value (ud->settings, "preset_selection"); -void -enforce_preset_type(const gchar *name, signal_user_data_t *ud) -{ - gint folder_pos, pos; - GtkWidget *normal, *folder; - gint ptype; + count = ghb_array_len(preset); + if (count > 0) + name = g_value_get_string(ghb_array_get_nth(preset, count-1)); + else + count = 1; - normal = GHB_WIDGET(ud->builder, "preset_type_normal"); - folder = GHB_WIDGET(ud->builder, "preset_type_folder"); - if (ghb_presets_find(presetsPlist, NULL, name, &folder_pos, &pos)) + indices = ghb_preset_indices_from_path(presetsPlist, preset, &len); + dict = presets_get_dict(presetsPlist, indices, len); + if (dict != NULL) { - ptype = ghb_presets_get_type(presetsPlist, folder_pos, pos); - if (ptype & PRESETS_FOLDER) - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(folder), - TRUE); - else - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(normal), - TRUE); - gtk_widget_set_sensitive(folder, ptype & PRESETS_FOLDER); - gtk_widget_set_sensitive(normal, !(ptype & PRESETS_FOLDER)); + description = g_value_get_string( + ghb_dict_lookup(dict, "PresetDescription")); + ghb_ui_update(ud, "PresetDescription", ghb_string_value(description)); } - else + + desc = GTK_TEXT_VIEW(GHB_WIDGET(ud->builder, "PresetDescription")); + dialog = GHB_WIDGET(ud->builder, "preset_save_dialog"); + entry = GTK_ENTRY(GHB_WIDGET(ud->builder, "PresetName")); + gtk_entry_set_text(entry, name); + response = gtk_dialog_run(GTK_DIALOG(dialog)); + gtk_widget_hide(dialog); + if (response == GTK_RESPONSE_OK) { - gtk_widget_set_sensitive(folder, TRUE); - gtk_widget_set_sensitive(normal, TRUE); + // save the preset + const gchar *name = gtk_entry_get_text(entry); + GValue *dest; + + if (count > MAX_NESTED_PRESET-1) + count = MAX_NESTED_PRESET-1; + + dest = ghb_array_value_new(MAX_NESTED_PRESET); + if (indices != NULL) + { + gint ptype; + + ptype = ghb_presets_get_type(presetsPlist, indices, len); + if (ptype == PRESETS_CUSTOM) + { + ghb_array_copy(dest, preset, count-1); + } + } + ghb_array_append(dest, ghb_string_value_new(name)); + ghb_widget_to_setting(ud->settings, GTK_WIDGET(desc)); + folder_save(ud, dest); + ghb_value_free(dest); } + if (indices != NULL) + g_free(indices); } -void +G_MODULE_EXPORT void presets_save_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud) { GtkWidget *dialog; GtkEntry *entry; GtkTextView *desc; GtkResponseType response; - gchar *preset; + GValue *preset; + const gchar *name = ""; + gint count, *indices, len; g_debug("presets_save_clicked_cb ()"); - preset = ghb_settings_get_string (ud->settings, "preset"); - // Clear the description - desc = GTK_TEXT_VIEW(GHB_WIDGET(ud->builder, "preset_description")); + preset = ghb_settings_get_value (ud->settings, "preset_selection"); + + count = ghb_array_len(preset); + if (count > 0) + name = g_value_get_string(ghb_array_get_nth(preset, count-1)); + else + count = 1; + + desc = GTK_TEXT_VIEW(GHB_WIDGET(ud->builder, "PresetDescription")); dialog = GHB_WIDGET(ud->builder, "preset_save_dialog"); - entry = GTK_ENTRY(GHB_WIDGET(ud->builder, "preset_name")); - gtk_entry_set_text(entry, preset); - enforce_preset_type(preset, ud); - g_free(preset); + entry = GTK_ENTRY(GHB_WIDGET(ud->builder, "PresetName")); + gtk_entry_set_text(entry, name); response = gtk_dialog_run(GTK_DIALOG(dialog)); gtk_widget_hide(dialog); if (response == GTK_RESPONSE_OK) { // save the preset const gchar *name = gtk_entry_get_text(entry); - g_debug("description to settings"); - ghb_widget_to_setting(ud->settings, GTK_WIDGET(desc)); - if (ghb_settings_get_boolean(ud->settings, "preset_type_folder")) - { - folder_save(ud, name); - } - else + GValue *dest; + + dest = ghb_array_value_new(MAX_NESTED_PRESET); + indices = ghb_preset_indices_from_path(presetsPlist, preset, &len); + if (indices) { - // Construct the audio settings presets from the current audio list - update_audio_presets(ud); - settings_save(ud, NULL, name); + gint ptype; + + ptype = ghb_presets_get_type(presetsPlist, indices, len); + if (ptype == PRESETS_CUSTOM) + { + ghb_array_copy(dest, preset, count-1); + } + g_free(indices); } - // Make the new preset the selected item - ghb_select_preset(ud->builder, NULL, name); + ghb_array_append(dest, ghb_string_value_new(name)); + + ghb_widget_to_setting(ud->settings, GTK_WIDGET(desc)); + + // Construct the audio settings presets from the current audio list + update_audio_presets(ud); + update_subtitle_presets(ud); + settings_save(ud, dest); + ghb_value_free(dest); } } -void +G_MODULE_EXPORT void preset_type_changed_cb(GtkWidget *widget, signal_user_data_t *ud) { ghb_widget_to_setting(ud->settings, widget); } -void -preset_name_changed_cb(GtkWidget *entry, signal_user_data_t *ud) -{ - gchar *name; - - name = ghb_widget_string(entry); - enforce_preset_type(name, ud); -} - -void +G_MODULE_EXPORT void presets_restore_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud) { + GValue *preset; + g_debug("presets_restore_clicked_cb ()"); // Reload only the standard presets ghb_presets_reload(ud); // Updating the presets list shuffles things around // need to make sure the proper preset is selected - gchar *folder = ghb_settings_get_string (ud->settings, "folder"); - gchar *preset = ghb_settings_get_string (ud->settings, "preset"); - ghb_select_preset(ud->builder, folder, preset); - g_free(preset); + preset = ghb_settings_get_value (ud->settings, "preset"); + ghb_select_preset(ud->builder, preset); } -void +G_MODULE_EXPORT void presets_remove_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud) { GtkTreeView *treeview; @@ -1735,22 +3693,19 @@ presets_remove_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud) { GtkWidget *dialog; GtkTreePath *path; - gint *indices; - gint folder_pos, pos, ptype; + gint *indices, len; + gboolean folder; gtk_tree_model_get(store, &iter, 0, &preset, -1); path = gtk_tree_model_get_path(store, &iter); indices = gtk_tree_path_get_indices(path); - folder_pos = indices[0]; - pos = -1; - if (gtk_tree_path_get_depth(path) > 1) - pos = indices[1]; - gtk_tree_path_free(path); - ptype = ghb_presets_get_type(presetsPlist, folder_pos, pos); + len = gtk_tree_path_get_depth(path); + + folder = ghb_presets_get_folder(presetsPlist, indices, len); dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, "Confirm deletion of %s:\n\n%s", - (ptype & PRESETS_FOLDER) ? "folder" : "preset", + folder ? "folder" : "preset", preset); response = gtk_dialog_run(GTK_DIALOG(dialog)); gtk_widget_destroy (dialog); @@ -1768,31 +3723,29 @@ presets_remove_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud) // Remove the selected item // First unselect it so that selecting the new item works properly gtk_tree_selection_unselect_iter (selection, &iter); - if (ghb_presets_remove(presetsPlist, folder_pos, pos)) + if (ghb_presets_remove(presetsPlist, indices, len)) { - store_plist(presetsPlist, "presets"); - presets_list_remove(ud, folder_pos, pos); + store_presets(); + presets_list_remove(ud, indices, len); } if (!valid) valid = gtk_tree_model_get_iter_first(store, &nextIter); if (valid) { + gtk_tree_path_free(path); path = gtk_tree_model_get_path(store, &nextIter); indices = gtk_tree_path_get_indices(path); - folder_pos = indices[0]; - pos = -1; - if (gtk_tree_path_get_depth(path) > 1) - pos = indices[1]; - gtk_tree_path_free(path); - ghb_select_preset2(ud->builder, folder_pos, pos); + len = gtk_tree_path_get_depth(path); + ghb_select_preset2(ud->builder, indices, len); } } g_free(preset); + gtk_tree_path_free(path); } } // controls where valid drop locations are -gboolean +G_MODULE_EXPORT gboolean presets_drag_motion_cb( GtkTreeView *tv, GdkDragContext *ctx, @@ -1803,12 +3756,20 @@ presets_drag_motion_cb( { GtkTreePath *path = NULL; GtkTreeViewDropPosition drop_pos; - gint *indices, folder_pos, pos; + gint *indices, len; GtkTreeIter iter; GtkTreeView *srctv; GtkTreeModel *model; GtkTreeSelection *select; gint src_ptype, dst_ptype; + gboolean src_folder, dst_folder; + GValue *preset; + gint tree_depth, ii; + GtkWidget *widget; + + widget = gtk_drag_get_source_widget(ctx); + if (widget == NULL || widget != GTK_WIDGET(tv)) + return TRUE; // Get the type of the object being dragged srctv = GTK_TREE_VIEW(gtk_drag_get_source_widget(ctx)); @@ -1816,48 +3777,71 @@ presets_drag_motion_cb( gtk_tree_selection_get_selected (select, &model, &iter); path = gtk_tree_model_get_path (model, &iter); indices = gtk_tree_path_get_indices(path); - folder_pos = indices[0]; - pos = -1; - if (gtk_tree_path_get_depth(path) > 1) - pos = indices[1]; + len = gtk_tree_path_get_depth(path); + + preset = presets_get_dict(presetsPlist, indices, len); + tree_depth = preset_tree_depth(preset); + + src_ptype = ghb_presets_get_type(presetsPlist, indices, len); + src_folder = ghb_presets_get_folder(presetsPlist, indices, len); gtk_tree_path_free(path); - src_ptype = ghb_presets_get_type(presetsPlist, folder_pos, pos); + + if (src_folder && tree_depth == 1) + tree_depth = 2; // The rest checks that the destination is a valid position // in the list. gtk_tree_view_get_dest_row_at_pos (tv, x, y, &path, &drop_pos); if (path == NULL) { - gdk_drag_status(ctx, GDK_ACTION_MOVE, time); + gdk_drag_status(ctx, 0, time); return TRUE; } - indices = gtk_tree_path_get_indices(path); - folder_pos = indices[0]; - pos = -1; - if (gtk_tree_path_get_depth(path) > 1) - pos = indices[1]; - dst_ptype = ghb_presets_get_type(presetsPlist, folder_pos, pos); - - // Don't allow *drop into* if the source is a folder - if (((src_ptype & PRESETS_FOLDER) || (!(dst_ptype & PRESETS_FOLDER))) && - drop_pos == GTK_TREE_VIEW_DROP_INTO_OR_BEFORE) - drop_pos = GTK_TREE_VIEW_DROP_BEFORE; - if (((src_ptype & PRESETS_FOLDER) || (!(dst_ptype & PRESETS_FOLDER))) && - drop_pos == GTK_TREE_VIEW_DROP_INTO_OR_AFTER) - drop_pos = GTK_TREE_VIEW_DROP_AFTER; - // Don't allow droping folders into child items - if ((src_ptype & PRESETS_FOLDER) && gtk_tree_path_get_depth(path) > 1) + // Don't allow repositioning of builtin presets + if (src_ptype != PRESETS_CUSTOM) + { + gdk_drag_status(ctx, 0, time); + return TRUE; + } + + len = gtk_tree_path_get_depth(path); + if (len+tree_depth-1 >= MAX_NESTED_PRESET) { + if (drop_pos == GTK_TREE_VIEW_DROP_INTO_OR_BEFORE) + drop_pos = GTK_TREE_VIEW_DROP_BEFORE; + if (drop_pos == GTK_TREE_VIEW_DROP_INTO_OR_AFTER) + drop_pos = GTK_TREE_VIEW_DROP_AFTER; + } + for (ii = len+tree_depth-1; ii > MAX_NESTED_PRESET; ii--) gtk_tree_path_up(path); - drop_pos = GTK_TREE_VIEW_DROP_AFTER; + indices = gtk_tree_path_get_indices(path); + len = gtk_tree_path_get_depth(path); + dst_ptype = ghb_presets_get_type(presetsPlist, indices, len); + dst_folder = ghb_presets_get_folder(presetsPlist, indices, len); + // Don't allow mixing custom presets in the builtins + if (dst_ptype != PRESETS_CUSTOM) + { + gdk_drag_status(ctx, 0, time); + return TRUE; + } + + // Only allow *drop into* for folders + if (!dst_folder) + { + if (drop_pos == GTK_TREE_VIEW_DROP_INTO_OR_BEFORE) + drop_pos = GTK_TREE_VIEW_DROP_BEFORE; + if (drop_pos == GTK_TREE_VIEW_DROP_INTO_OR_AFTER) + drop_pos = GTK_TREE_VIEW_DROP_AFTER; } + + len = gtk_tree_path_get_depth(path); gtk_tree_view_set_drag_dest_row(tv, path, drop_pos); gtk_tree_path_free(path); gdk_drag_status(ctx, GDK_ACTION_MOVE, time); return TRUE; } -void +G_MODULE_EXPORT void presets_drag_cb( GtkTreeView *dstwidget, GdkDragContext *dc, @@ -1869,9 +3853,9 @@ presets_drag_cb( GtkTreePath *path = NULL; GtkTreeViewDropPosition drop_pos; GtkTreeIter dstiter, srciter; - gint *indices; - gint dst_folder_pos, dst_pos, src_folder_pos, src_pos; - gint src_ptype, dst_ptype; + gint *dst_indices, dst_len, *src_indices, src_len; + gint src_ptype; + gboolean src_folder, dst_folder; GtkTreeModel *dstmodel = gtk_tree_view_get_model(dstwidget); @@ -1903,132 +3887,165 @@ presets_drag_cb( GtkTreeModel *srcmodel; GtkTreeSelection *select; GtkTreePath *srcpath = NULL; - GValue *dict, *presets; GValue *preset; + gint tree_depth, ii; srcwidget = GTK_TREE_VIEW(gtk_drag_get_source_widget(dc)); select = gtk_tree_view_get_selection (srcwidget); gtk_tree_selection_get_selected (select, &srcmodel, &srciter); srcpath = gtk_tree_model_get_path (srcmodel, &srciter); - indices = gtk_tree_path_get_indices(srcpath); - src_folder_pos = indices[0]; - src_pos = -1; - if (gtk_tree_path_get_depth(srcpath) > 1) - src_pos = indices[1]; - src_ptype = ghb_presets_get_type(presetsPlist, src_folder_pos, src_pos); - preset = presets_get_dict(presetsPlist, src_folder_pos, src_pos); + src_indices = gtk_tree_path_get_indices(srcpath); + src_len = gtk_tree_path_get_depth(srcpath); + src_ptype = ghb_presets_get_type(presetsPlist, src_indices, src_len); + src_folder = ghb_presets_get_folder(presetsPlist, src_indices, src_len); + preset = ghb_value_dup( + presets_get_dict(presetsPlist, src_indices, src_len)); gtk_tree_path_free(srcpath); - indices = gtk_tree_path_get_indices(path); - dst_folder_pos = indices[0]; - dst_pos = -1; - if (gtk_tree_path_get_depth(path) > 1) - dst_pos = indices[1]; - dst_ptype = ghb_presets_get_type(presetsPlist, dst_folder_pos, dst_pos); + // Don't allow repositioning of builtin presets + if (src_ptype != PRESETS_CUSTOM) + return; - if ((src_ptype & PRESETS_FOLDER) && gtk_tree_path_get_depth(path) > 1) - gtk_tree_path_up(path); + tree_depth = preset_tree_depth(preset); + if (src_folder && tree_depth == 1) + tree_depth = 2; + + dst_len = gtk_tree_path_get_depth(path); + if (dst_len+tree_depth-1 >= MAX_NESTED_PRESET) + { + if (drop_pos == GTK_TREE_VIEW_DROP_INTO_OR_BEFORE) + drop_pos = GTK_TREE_VIEW_DROP_BEFORE; + if (drop_pos == GTK_TREE_VIEW_DROP_INTO_OR_AFTER) + drop_pos = GTK_TREE_VIEW_DROP_AFTER; + } + for (ii = dst_len+tree_depth-1; ii > MAX_NESTED_PRESET; ii--) + gtk_tree_path_up(path); + dst_indices = gtk_tree_path_get_indices(path); + dst_len = gtk_tree_path_get_depth(path); + dst_folder = ghb_presets_get_folder(presetsPlist, dst_indices, dst_len); + // Only allow *drop into* for folders + if (!dst_folder) + { + if (drop_pos == GTK_TREE_VIEW_DROP_INTO_OR_BEFORE) + drop_pos = GTK_TREE_VIEW_DROP_BEFORE; + if (drop_pos == GTK_TREE_VIEW_DROP_INTO_OR_AFTER) + drop_pos = GTK_TREE_VIEW_DROP_AFTER; + } if (gtk_tree_model_get_iter (dstmodel, &dstiter, path)) { GtkTreeIter iter; GtkTreePath *dstpath = NULL; - if ((src_ptype & PRESETS_FOLDER) || - gtk_tree_path_get_depth(path) > 1) - { - switch (drop_pos) - { - case GTK_TREE_VIEW_DROP_BEFORE: - case GTK_TREE_VIEW_DROP_INTO_OR_BEFORE: - gtk_tree_store_insert_before(GTK_TREE_STORE (dstmodel), - &iter, NULL, &dstiter); - break; - - case GTK_TREE_VIEW_DROP_AFTER: - case GTK_TREE_VIEW_DROP_INTO_OR_AFTER: - gtk_tree_store_insert_after(GTK_TREE_STORE (dstmodel), - &iter, NULL, &dstiter); - break; - - default: - break; - } - } - else + switch (drop_pos) { - switch (drop_pos) - { - case GTK_TREE_VIEW_DROP_BEFORE: - gtk_tree_store_insert_before(GTK_TREE_STORE (dstmodel), - &iter, NULL, &dstiter); - break; - - case GTK_TREE_VIEW_DROP_INTO_OR_BEFORE: - gtk_tree_store_insert(GTK_TREE_STORE (dstmodel), - &iter, &dstiter, 0); - break; - - case GTK_TREE_VIEW_DROP_AFTER: - gtk_tree_store_insert_after(GTK_TREE_STORE (dstmodel), - &iter, NULL, &dstiter); - break; - - case GTK_TREE_VIEW_DROP_INTO_OR_AFTER: - gtk_tree_store_insert_after(GTK_TREE_STORE (dstmodel), - &iter, &dstiter, 0); - break; - - default: - break; - } + case GTK_TREE_VIEW_DROP_BEFORE: + gtk_tree_store_insert_before(GTK_TREE_STORE (dstmodel), + &iter, NULL, &dstiter); + break; + + case GTK_TREE_VIEW_DROP_INTO_OR_BEFORE: + gtk_tree_store_insert(GTK_TREE_STORE (dstmodel), + &iter, &dstiter, 0); + break; + + case GTK_TREE_VIEW_DROP_AFTER: + gtk_tree_store_insert_after(GTK_TREE_STORE (dstmodel), + &iter, NULL, &dstiter); + break; + + case GTK_TREE_VIEW_DROP_INTO_OR_AFTER: + gtk_tree_store_insert_after(GTK_TREE_STORE (dstmodel), + &iter, &dstiter, 0); + break; + + default: + break; } - presets_list_update_item(ud, presetsPlist, &iter, - src_folder_pos, src_pos); dstpath = gtk_tree_model_get_path (dstmodel, &iter); - indices = gtk_tree_path_get_indices(dstpath); - dst_folder_pos = indices[0]; - dst_pos = -1; - if (gtk_tree_path_get_depth(dstpath) > 1) - dst_pos = indices[1]; + dst_indices = gtk_tree_path_get_indices(dstpath); + dst_len = gtk_tree_path_get_depth(dstpath); + ghb_presets_insert(presetsPlist, preset, dst_indices, dst_len); gtk_tree_path_free(dstpath); - if (dst_pos != -1) - { - dict = presets_get_dict(presetsPlist, dst_folder_pos, -1); - presets = ghb_dict_lookup(dict, "preset_folder"); - ghb_array_insert(presets, dst_pos, preset); - } - else - { - ghb_array_insert(presetsPlist, dst_folder_pos, preset); - } srcpath = gtk_tree_model_get_path (srcmodel, &srciter); - indices = gtk_tree_path_get_indices(srcpath); - src_folder_pos = indices[0]; - src_pos = -1; - if (gtk_tree_path_get_depth(srcpath) > 1) - src_pos = indices[1]; + src_indices = gtk_tree_path_get_indices(srcpath); + src_len = gtk_tree_path_get_depth(srcpath); + ghb_presets_remove(presetsPlist, src_indices, src_len); gtk_tree_path_free(srcpath); - if (src_pos != -1) - { - dict = presets_get_dict(presetsPlist, src_folder_pos, -1); - presets = ghb_dict_lookup(dict, "preset_folder"); - ghb_array_remove(presets, src_pos); - } - else - { - ghb_array_remove(presetsPlist, src_folder_pos); - } + gtk_tree_store_remove (GTK_TREE_STORE (srcmodel), &srciter); - store_plist(presetsPlist, "presets"); + + dstpath = gtk_tree_model_get_path (dstmodel, &iter); + dst_indices = gtk_tree_path_get_indices(dstpath); + dst_len = gtk_tree_path_get_depth(dstpath); + presets_list_update_item(ud, dst_indices, dst_len, TRUE); + gtk_tree_path_free(dstpath); + + store_presets(); } gtk_tree_path_free(path); } } +void +presets_row_expanded_cb( + GtkTreeView *treeview, + GtkTreeIter *iter, + GtkTreePath *path, + signal_user_data_t *ud) +{ + gint *indices, len; + gboolean expanded, folder; + GValue *dict; + + expanded = gtk_tree_view_row_expanded(treeview, path); + indices = gtk_tree_path_get_indices(path); + len = gtk_tree_path_get_depth(path); + dict = presets_get_dict(presetsPlist, indices, len); + if (preset_folder_is_open(dict)) + { + if (expanded) + return; + } + else if (!expanded) + { + return; + } + folder = ghb_presets_get_folder(presetsPlist, indices, len); + if (folder) + { + presets_set_folder_open(expanded, indices, len); + } + + // Collapsing parent folder collapses all children + if (!expanded) + { + GValue *presets = NULL; + gint *more_indices, count, ii; + + more_indices = g_malloc((len+1)*sizeof(gint)); + memcpy(more_indices, indices, len*sizeof(gint)); + + presets = presets_get_folder(presetsPlist, indices, len); + count = ghb_array_len(presets); + for (ii = 0; ii < count; ii++) + { + dict = ghb_array_get_nth(presets, ii); + folder = ghb_preset_folder(dict); + if (folder) + { + more_indices[len] = ii; + presets_set_folder_open(expanded, more_indices, len+1); + } + } + g_free(more_indices); + } + store_presets(); +} + static void preset_update_title_deps(signal_user_data_t *ud, ghb_title_info_t *tinfo) { @@ -2037,10 +4054,11 @@ preset_update_title_deps(signal_user_data_t *ud, ghb_title_info_t *tinfo) ghb_ui_update(ud, "scale_width", ghb_int64_value(tinfo->width - tinfo->crop[2] - tinfo->crop[3])); // If anamorphic or keep_aspect, the hight will be automatically calculated - gboolean keep_aspect, anamorphic; - keep_aspect = ghb_settings_get_boolean(ud->settings, "keep_aspect"); - anamorphic = ghb_settings_get_boolean(ud->settings, "anamorphic"); - if (!(keep_aspect || anamorphic)) + gboolean keep_aspect; + gint pic_par; + keep_aspect = ghb_settings_get_boolean(ud->settings, "PictureKeepRatio"); + pic_par = ghb_settings_combo_int(ud->settings, "PicturePAR"); + if (!(keep_aspect || pic_par) || pic_par == 3) { ghb_ui_update(ud, "scale_height", ghb_int64_value(tinfo->height - tinfo->crop[0] - tinfo->crop[1])); @@ -2050,31 +4068,97 @@ preset_update_title_deps(signal_user_data_t *ud, ghb_title_info_t *tinfo) // you pass it a cropped width or height == 0. gint bound; bound = tinfo->height / 2 - 2; - widget = GHB_WIDGET (ud->builder, "crop_top"); + widget = GHB_WIDGET (ud->builder, "PictureTopCrop"); gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 0, bound); - widget = GHB_WIDGET (ud->builder, "crop_bottom"); + widget = GHB_WIDGET (ud->builder, "PictureBottomCrop"); gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 0, bound); bound = tinfo->width / 2 - 2; - widget = GHB_WIDGET (ud->builder, "crop_left"); + widget = GHB_WIDGET (ud->builder, "PictureLeftCrop"); gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 0, bound); - widget = GHB_WIDGET (ud->builder, "crop_right"); + widget = GHB_WIDGET (ud->builder, "PictureRightCrop"); gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 0, bound); - if (ghb_settings_get_boolean(ud->settings, "autocrop")) + if (ghb_settings_get_boolean(ud->settings, "PictureAutoCrop")) { - ghb_ui_update(ud, "crop_top", ghb_int64_value(tinfo->crop[0])); - ghb_ui_update(ud, "crop_bottom", ghb_int64_value(tinfo->crop[1])); - ghb_ui_update(ud, "crop_left", ghb_int64_value(tinfo->crop[2])); - ghb_ui_update(ud, "crop_right", ghb_int64_value(tinfo->crop[3])); + ghb_ui_update(ud, "PictureTopCrop", ghb_int64_value(tinfo->crop[0])); + ghb_ui_update(ud, "PictureBottomCrop", ghb_int64_value(tinfo->crop[1])); + ghb_ui_update(ud, "PictureLeftCrop", ghb_int64_value(tinfo->crop[2])); + ghb_ui_update(ud, "PictureRightCrop", ghb_int64_value(tinfo->crop[3])); } } void +ghb_refresh_preset(signal_user_data_t *ud) +{ + ghb_title_info_t tinfo; + GValue *preset; + gint *indices, len; + + g_debug("ghb_refresh_preset ()"); + preset = ghb_settings_get_value(ud->settings, "preset_selection"); + indices = ghb_preset_indices_from_path(presetsPlist, preset, &len); + if (indices) + { + gboolean folder; + + folder = ghb_presets_get_folder(presetsPlist, indices, len); + if (!folder) + { + ud->dont_clear_presets = TRUE; + // Temporarily set the video_quality range to (0,100) + // This is needed so the video_quality value does not get + // truncated when set. The range will be readjusted below + GtkWidget *qp = GHB_WIDGET(ud->builder, "VideoQualitySlider"); + gtk_range_set_range (GTK_RANGE(qp), 0, 100); + gtk_scale_set_digits(GTK_SCALE(qp), 3); + // Clear the audio list prior to changing the preset. Existing + // audio can cause the container extension to be automatically + // changed when it shouldn't be + ghb_clear_audio_list(ud); + ghb_set_preset_from_indices(ud, indices, len); + gint titleindex; + titleindex = ghb_settings_combo_int(ud->settings, "title"); + ghb_set_pref_audio(titleindex, ud); + ghb_set_pref_subtitle(titleindex, ud); + ghb_settings_set_boolean(ud->settings, "preset_modified", FALSE); + if (ghb_get_title_info (&tinfo, titleindex)) + { + preset_update_title_deps(ud, &tinfo); + } + ghb_set_scale (ud, GHB_PIC_KEEP_PAR); + ud->dont_clear_presets = FALSE; + + gdouble vqmin, vqmax, step, page; + gint digits; + gboolean inverted; + + ghb_vquality_range(ud, &vqmin, &vqmax, &step, + &page, &digits, &inverted); + gtk_range_set_range (GTK_RANGE(qp), vqmin, vqmax); + gtk_range_set_increments (GTK_RANGE(qp), step, page); + gtk_scale_set_digits(GTK_SCALE(qp), digits); + gtk_range_set_inverted (GTK_RANGE(qp), inverted); + + gchar *text; + gint crop[4]; + GtkWidget *crop_widget; + crop[0] = ghb_settings_get_int(ud->settings, "PictureTopCrop"); + crop[1] = ghb_settings_get_int(ud->settings, "PictureBottomCrop"); + crop[2] = ghb_settings_get_int(ud->settings, "PictureLeftCrop"); + crop[3] = ghb_settings_get_int(ud->settings, "PictureRightCrop"); + crop_widget = GHB_WIDGET (ud->builder, "crop_values"); + text = g_strdup_printf("%d:%d:%d:%d", + crop[0], crop[1], crop[2], crop[3]); + gtk_label_set_text (GTK_LABEL(crop_widget), text); + g_free(text); + } + } +} + +G_MODULE_EXPORT void presets_list_selection_changed_cb(GtkTreeSelection *selection, signal_user_data_t *ud) { GtkTreeModel *store; - GtkTreeIter iter, piter; - gchar *preset; - gchar *folder = NULL; + GtkTreeIter iter; ghb_title_info_t tinfo; GtkWidget *widget; @@ -2082,45 +4166,92 @@ presets_list_selection_changed_cb(GtkTreeSelection *selection, signal_user_data_ widget = GHB_WIDGET (ud->builder, "presets_remove"); if (gtk_tree_selection_get_selected(selection, &store, &iter)) { - gtk_tree_model_get(store, &iter, 0, &preset, -1); - if (gtk_tree_model_iter_parent(store, &piter, &iter)) - { - gtk_tree_model_get(store, &piter, 0, &folder, -1); - } - ud->dont_clear_presets = TRUE; - // Temporarily set the video_quality range to (0,100) - // This is needed so the video_quality value does not get - // truncated when set. The range will be readjusted below - GtkWidget *qp = GHB_WIDGET(ud->builder, "video_quality"); - gtk_range_set_range (GTK_RANGE(qp), 0, 100); - // Clear the audio list prior to changing the preset. Existing audio - // can cause the container extension to be automatically changed when - // it shouldn't be - ghb_clear_audio_list(ud); - ghb_set_preset(ud, folder, preset); - gint titleindex; - titleindex = ghb_settings_combo_int(ud->settings, "title"); - ghb_set_pref_audio(titleindex, ud); - ghb_settings_set_boolean(ud->settings, "preset_modified", FALSE); - ud->dont_clear_presets = FALSE; - if (ghb_get_title_info (&tinfo, titleindex)) - { - preset_update_title_deps(ud, &tinfo); - } - ghb_set_scale (ud, GHB_SCALE_KEEP_NONE); - - gint vqmin, vqmax; - ghb_vquality_range(ud, &vqmin, &vqmax); - gtk_range_set_range (GTK_RANGE(qp), vqmin, vqmax); + GtkTreePath *treepath; + gint *indices, len; + GValue *path; + gboolean folder; + + treepath = gtk_tree_model_get_path(store, &iter); + indices = gtk_tree_path_get_indices(treepath); + len = gtk_tree_path_get_depth(treepath); + + path = preset_path_from_indices(presetsPlist, indices, len); + ghb_settings_take_value(ud->settings, "preset_selection", path); + + folder = ghb_presets_get_folder(presetsPlist, indices, len); + if (!folder) + { + ud->dont_clear_presets = TRUE; + // Temporarily set the video_quality range to (0,100) + // This is needed so the video_quality value does not get + // truncated when set. The range will be readjusted below + GtkWidget *qp = GHB_WIDGET(ud->builder, "VideoQualitySlider"); + gtk_range_set_range (GTK_RANGE(qp), 0, 100); + gtk_scale_set_digits(GTK_SCALE(qp), 3); + // Clear the audio list prior to changing the preset. Existing + // audio can cause the container extension to be automatically + // changed when it shouldn't be + ghb_clear_audio_list(ud); + ghb_set_preset_from_indices(ud, indices, len); + gint titleindex; + titleindex = ghb_settings_combo_int(ud->settings, "title"); + ghb_set_pref_audio(titleindex, ud); + ghb_set_pref_subtitle(titleindex, ud); + ghb_settings_set_boolean(ud->settings, "preset_modified", FALSE); + if (ghb_get_title_info (&tinfo, titleindex)) + { + preset_update_title_deps(ud, &tinfo); + } + ghb_set_scale (ud, GHB_PIC_KEEP_PAR); + ud->dont_clear_presets = FALSE; + + gdouble vqmin, vqmax, step, page; + gint digits; + gboolean inverted; + + ghb_vquality_range(ud, &vqmin, &vqmax, &step, + &page, &digits, &inverted); + gtk_range_set_range (GTK_RANGE(qp), vqmin, vqmax); + gtk_range_set_increments (GTK_RANGE(qp), step, page); + gtk_scale_set_digits(GTK_SCALE(qp), digits); + gtk_range_set_inverted (GTK_RANGE(qp), inverted); + + gchar *text; + gint crop[4]; + GtkWidget *crop_widget; + crop[0] = ghb_settings_get_int(ud->settings, "PictureTopCrop"); + crop[1] = ghb_settings_get_int(ud->settings, "PictureBottomCrop"); + crop[2] = ghb_settings_get_int(ud->settings, "PictureLeftCrop"); + crop[3] = ghb_settings_get_int(ud->settings, "PictureRightCrop"); + crop_widget = GHB_WIDGET (ud->builder, "crop_values"); + text = g_strdup_printf("%d:%d:%d:%d", + crop[0], crop[1], crop[2], crop[3]); + gtk_label_set_text (GTK_LABEL(crop_widget), text); + g_free(text); + } + gtk_tree_path_free(treepath); gtk_widget_set_sensitive(widget, TRUE); - g_free(preset); - if (folder) g_free(folder); } else { g_debug("No selection??? Perhaps unselected."); gtk_widget_set_sensitive(widget, FALSE); } + if (ghb_settings_combo_int(ud->settings, "PtoPType") == 0) + { + gint start, end; + start = ghb_settings_get_int(ud->settings, "start_point"); + end = ghb_settings_get_int(ud->settings, "end_point"); + widget = GHB_WIDGET (ud->builder, "ChapterMarkers"); + gtk_widget_set_sensitive(widget, TRUE); + if (start == end) + { + ud->dont_clear_presets = TRUE; + ghb_ui_update(ud, "ChapterMarkers", ghb_boolean_value(FALSE)); + ud->dont_clear_presets = FALSE; + gtk_widget_set_sensitive(widget, FALSE); + } + } } void @@ -2137,7 +4268,7 @@ ghb_clear_presets_selection(signal_user_data_t *ud) ghb_settings_set_boolean(ud->settings, "preset_modified", TRUE); } -void +G_MODULE_EXPORT void presets_frame_size_allocate_cb(GtkWidget *widget, GtkAllocation *allocation, signal_user_data_t *ud) { GtkTreeView *treeview; @@ -2157,25 +4288,71 @@ presets_frame_size_allocate_cb(GtkWidget *widget, GtkAllocation *allocation, sig } } -void +G_MODULE_EXPORT void presets_default_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud) { - gchar *folder, *preset; - gint folder_pos, pos; + GValue *preset; + gint *indices, len; - folder = ghb_settings_get_string(ud->settings, "folder"); - preset = ghb_settings_get_string(ud->settings, "preset"); - if (ghb_presets_find(presetsPlist, folder, preset, &folder_pos, &pos)) + g_debug("presets_default_clicked_cb ()"); + preset = ghb_settings_get_value(ud->settings, "preset_selection"); + indices = ghb_preset_indices_from_path(presetsPlist, preset, &len); + if (indices) { - if (!(ghb_presets_get_type(presetsPlist, folder_pos, pos) & - PRESETS_FOLDER)) + if (!ghb_presets_get_folder(presetsPlist, indices, len)) { ghb_presets_list_clear_default(ud); - ghb_set_preset_default(ud->settings); + presets_set_default(indices, len); ghb_presets_list_default(ud); } + g_free(indices); + } +} + +G_MODULE_EXPORT void +preset_edited_cb( + GtkCellRendererText *cell, + gchar *path, + gchar *text, + signal_user_data_t *ud) +{ + GtkTreePath *treepath; + GtkTreeStore *store; + GtkTreeView *treeview; + GtkTreeIter iter; + gint *indices, len, count; + GValue *dict; + GValue *preset, *dest; + + g_debug("preset_edited_cb ()"); + g_debug("path (%s)", path); + g_debug("text (%s)", text); + + preset = ghb_settings_get_value (ud->settings, "preset_selection"); + dest = ghb_array_value_new(MAX_NESTED_PRESET); + count = ghb_array_len(preset); + ghb_array_copy(dest, preset, count-1); + ghb_array_append(dest, ghb_string_value_new(text)); + indices = ghb_preset_indices_from_path(presetsPlist, dest, &len); + ghb_value_free(dest); + if (indices != NULL) + { + // Already exists + g_free(indices); + return; } - g_free(folder); - g_free(preset); + + treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "presets_list")); + store = GTK_TREE_STORE(gtk_tree_view_get_model(treeview)); + treepath = gtk_tree_path_new_from_string (path); + indices = gtk_tree_path_get_indices(treepath); + len = gtk_tree_path_get_depth(treepath); + gtk_tree_model_get_iter(GTK_TREE_MODEL(store), &iter, treepath); + gtk_tree_store_set(store, &iter, 0, text, -1); + + dict = presets_get_dict(presetsPlist, indices, len); + ghb_dict_insert(dict, g_strdup("PresetName"), ghb_string_value_new(text)); + store_presets(); + gtk_tree_path_free (treepath); }