OSDN Git Service

LinGui: Add preset import/export
[handbrake-jp/handbrake-jp-git.git] / gtk / src / presets.c
index aafff05..b536c8a 100644 (file)
@@ -20,6 +20,7 @@
 #include "settings.h"
 #include "callbacks.h"
 #include "audiohandler.h"
+#include "subtitlehandler.h"
 #include "hb-backend.h"
 #include "plist.h"
 #include "resources.h"
@@ -43,6 +44,19 @@ 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*
@@ -503,6 +517,37 @@ presets_clear_default(GValue *presets)
        }
 }
 
+static void
+presets_customize(GValue *presets)
+{
+       gint count, ii;
+
+       count = ghb_array_len(presets);
+       for (ii = 0; ii < count; ii++)
+       {
+               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)
+               {
+                       ghb_dict_insert(dict, g_strdup("Type"), 
+                                               ghb_int64_value_new(PRESETS_CUSTOM));
+               }
+               folder = ghb_value_boolean(preset_dict_get_value(dict, "Folder"));
+               if (folder)
+               {
+                       GValue *nested;
+
+                       nested = ghb_dict_lookup(dict, "ChildrenArray");
+                       presets_customize(nested);
+               }
+       }
+}
+
 static gint*
 presets_find_default2(GValue *presets, gint *len)
 {
@@ -1020,7 +1065,7 @@ ghb_get_user_config_dir(gchar *subdir)
                gchar **split;
                gint ii;
 
-               split = g_strsplit(subdir, "/", -1);
+               split = g_strsplit(subdir, G_DIR_SEPARATOR_S, -1);
                for (ii = 0; split[ii] != NULL; ii++)
                {
                        gchar *tmp;
@@ -1119,14 +1164,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
@@ -1189,14 +1234,14 @@ 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_plist(prefsPlist, "preferences");
+       store_prefs();
        prefs_modified = FALSE;
 }
 
@@ -1216,7 +1261,7 @@ ghb_pref_set(GValue *settings, const gchar *key)
                if (ghb_value_cmp(value, value2) != 0)
                {
                        ghb_dict_insert(dict, g_strdup(key), ghb_value_dup(value));
-                       store_plist(prefsPlist, "preferences");
+                       store_prefs();
                        prefs_modified = TRUE;
                }
        }
@@ -1238,7 +1283,7 @@ ghb_pref_save(GValue *settings, const gchar *key)
                if (ghb_value_cmp(value, value2) != 0)
                {
                        ghb_dict_insert(dict, g_strdup(key), ghb_value_dup(value));
-                       store_plist(prefsPlist, "preferences");
+                       store_prefs();
                        prefs_modified = FALSE;
                }
        }
@@ -1249,7 +1294,7 @@ ghb_prefs_store(void)
 {
        if (prefs_modified)
        {
-               store_plist(prefsPlist, "preferences");
+               store_prefs();
                prefs_modified = FALSE;
        }
 }
@@ -1315,6 +1360,34 @@ 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)
 {
@@ -1329,29 +1402,53 @@ 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)
@@ -1376,7 +1473,7 @@ ghb_prefs_load(signal_user_data_t *ud)
                        g_free(indices);
                }
                ghb_dict_remove(dict, "default_preset");
-               store_plist(prefsPlist, "preferences");
+               store_prefs();
        }
 }
 
@@ -1690,7 +1787,7 @@ typedef struct
 static value_map_t vcodec_xlat[] =
 {
        {"MPEG-4 (FFmpeg)", "ffmpeg"},
-       {"MPEG-4 (XviD)", "xvid"},
+       {"MPEG-4 (XviD)", "ffmpeg"},
        {"H.264 (x264)", "x264"},
        {"VP3 (Theora)", "theora"},
        {NULL,NULL}
@@ -1699,6 +1796,7 @@ static value_map_t vcodec_xlat[] =
 static value_map_t acodec_xlat[] =
 {
        {"AAC (faac)", "faac"},
+       {"AAC (CoreAudio)", "faac"},
        {"AC3 Passthru", "ac3"},
        {"MP3 (lame)", "lame"},
        {"Vorbis (vorbis)", "vorbis"},
@@ -1708,10 +1806,10 @@ static value_map_t acodec_xlat[] =
 value_map_t container_xlat[] =
 {
        {"MP4 file", "mp4"},
-       {"M4V file", "m4v"},
+       {"M4V file", "mp4"},
        {"MKV file", "mkv"},
-       {"AVI file", "avi"},
-       {"OGM file", "ogm"},
+       {"AVI file", "mkv"},
+       {"OGM file", "mkv"},
        {NULL, NULL}
 };
 
@@ -2004,15 +2102,25 @@ export_value_xlat(GValue *dict)
        gval = export_value_xlat2(denoise_xlat, lin_val, G_TYPE_INT);
        if (gval)
                ghb_dict_insert(dict, g_strdup(key), gval);
-       key = "Subtitles";
-       lin_val = ghb_dict_lookup(dict, key);
-       gval = export_subtitle_xlat2(lin_val);
-       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;
-       gint count, ii;
 
        alist = ghb_dict_lookup(dict, "AudioList");
        count = ghb_array_len(alist);
@@ -2079,13 +2187,34 @@ import_value_xlat2(
                                return gval;
                        }
                }
-               //g_warning("Can't map value: (%s)", str);
                g_free(str);
        }
        else
        {
-               g_warning("Bad key: (%s)", key);
-               return NULL;
+               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;
 }
@@ -2132,19 +2261,85 @@ import_value_xlat(GValue *dict)
        gval = import_value_xlat2(defaults, denoise_xlat, key, mac_val);
        if (gval)
                ghb_dict_insert(dict, g_strdup(key), gval);
-       key = "Subtitles";
-       mac_val = ghb_dict_lookup(dict, key);
-       gval = import_subtitle_xlat2(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;
-       gint count, ii;
 
-       adeflist = ghb_dict_lookup(dict, "AudioList");
+       adeflist = ghb_dict_lookup(defaults, "AudioList");
        if (adeflist)
        {
                adefaults = ghb_array_get_nth(adeflist, 0);
@@ -2173,6 +2368,18 @@ import_value_xlat(GValue *dict)
                        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));
+                               }
+                       }
                }
        }
 }
@@ -2202,32 +2409,26 @@ import_xlat_preset(GValue *dict)
        {
        case 0:
        {
-               ghb_dict_insert(dict, g_strdup("anamorphic"), 
-                                               ghb_boolean_value_new(FALSE));
-               if (ghb_dict_lookup(dict, "ModDimensions") == NULL)
-                       ghb_dict_insert(dict, g_strdup("ModDimensions"), 
-                                                       ghb_boolean_value_new(TRUE));
+               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("anamorphic"), 
-                                               ghb_boolean_value_new(TRUE));
-               ghb_dict_insert(dict, g_strdup("ModDimensions"), 
-                                               ghb_boolean_value_new(FALSE));
+               ghb_dict_insert(dict, g_strdup("PictureModulus"), 
+                                               ghb_int_value_new(1));
        } break;
        case 2:
        {
-               ghb_dict_insert(dict, g_strdup("anamorphic"), 
-                                               ghb_boolean_value_new(TRUE));
-               ghb_dict_insert(dict, g_strdup("ModDimensions"), 
-                                               ghb_boolean_value_new(TRUE));
+               if (ghb_dict_lookup(dict, "PictureModulus") == NULL)
+                       ghb_dict_insert(dict, g_strdup("PictureModulus"), 
+                                                       ghb_int_value_new(16));
        } break;
        default:
        {
-               ghb_dict_insert(dict, g_strdup("anamorphic"), 
-                                               ghb_boolean_value_new(TRUE));
-               ghb_dict_insert(dict, g_strdup("ModDimensions"), 
-                                               ghb_boolean_value_new(TRUE));
+               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
@@ -2289,7 +2490,6 @@ import_xlat_preset(GValue *dict)
                                vquality = 51. - vquality * 51.;
                        } break;
 
-                       case HB_VCODEC_XVID:
                        case HB_VCODEC_FFMPEG:
                        {
                                vquality = 31. - vquality * 30.;
@@ -2341,12 +2541,10 @@ import_xlat_presets(GValue *presets)
 static void
 export_xlat_preset(GValue *dict)
 {
-       gboolean ana, round, autoscale, target, br, constant;
+       gboolean autoscale, target, br, constant;
 
        g_debug("export_xlat_prest ()");
        autoscale = ghb_value_boolean(preset_dict_get_value(dict, "autoscale"));
-       ana = ghb_value_boolean(preset_dict_get_value(dict, "anamorphic"));
-       round = ghb_value_boolean(preset_dict_get_value(dict, "ModDimensions"));
        target = ghb_value_boolean(
                                preset_dict_get_value(dict, "vquality_type_target"));
        br = ghb_value_boolean(
@@ -2361,20 +2559,6 @@ export_xlat_preset(GValue *dict)
                ghb_dict_insert(dict, g_strdup("UsesPictureSettings"), 
                                                ghb_int_value_new(1));
 
-       if (ana)
-       {
-               if (round)
-                       ghb_dict_insert(dict, g_strdup("PicturePAR"), 
-                                               ghb_int_value_new(2));
-               else
-                       ghb_dict_insert(dict, g_strdup("PicturePAR"), 
-                                               ghb_int_value_new(1));
-       }
-       else
-       {
-               ghb_dict_insert(dict, g_strdup("PicturePAR"), 
-                                               ghb_int_value_new(0));
-       }
        // VideoQualityType/0/1/2 - vquality_type_/target/bitrate/constant
        if (target)
        {
@@ -2391,9 +2575,28 @@ export_xlat_preset(GValue *dict)
                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++)
+       {
+               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));
+               }
+       }
+
        ghb_dict_remove(dict, "UsesMaxPictureSettings");
        ghb_dict_remove(dict, "autoscale");
-       ghb_dict_remove(dict, "anamorphic");
        ghb_dict_remove(dict, "vquality_type_target");
        ghb_dict_remove(dict, "vquality_type_bitrate");
        ghb_dict_remove(dict, "vquality_type_constant");
@@ -2427,6 +2630,16 @@ export_xlat_presets(GValue *presets)
        }
 }
 
+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
 store_presets()
 {
@@ -2438,6 +2651,22 @@ store_presets()
        ghb_value_free(export);
 }
 
+static void
+store_prefs(void)
+{
+       if (prefs_timeout_id != 0)
+       {
+               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
 ghb_presets_reload(signal_user_data_t *ud)
 {
@@ -2450,7 +2679,7 @@ ghb_presets_reload(signal_user_data_t *ud)
        if (std_presets == NULL) return;
 
        remove_std_presets(ud);
-    indices = presets_find_default(presetsPlist, &len);
+       indices = presets_find_default(presetsPlist, &len);
        if (indices)
        {
                presets_clear_default(std_presets);
@@ -2466,6 +2695,8 @@ ghb_presets_reload(signal_user_data_t *ud)
 
                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);
                presets_list_insert(ud, &indices, 1);
        }
@@ -2492,8 +2723,102 @@ check_old_presets()
        return FALSE;
 }
 
+static void
+replace_standard_presets()
+{
+       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();
+}
+
+static void
+update_standard_presets(signal_user_data_t *ud)
+{
+       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)
@@ -2516,6 +2841,7 @@ ghb_presets_load()
                import_xlat_presets(presetsPlist);
                store_presets();
        }
+       update_standard_presets(ud);
        import_xlat_presets(presetsPlist);
 }
 
@@ -2528,6 +2854,7 @@ settings_save(signal_user_data_t *ud, const GValue *path)
        GValue *value;
        gboolean autoscale;
        gint *indices, len, count;
+       gint *def_indices, def_len;
        const gchar *name;
        gboolean replace = FALSE;
 
@@ -2570,6 +2897,7 @@ settings_save(signal_user_data_t *ud, const GValue *path)
        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);
@@ -2618,7 +2946,16 @@ settings_save(signal_user_data_t *ud, const GValue *path)
        }
        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);
+       }
        else
        {
                ghb_dict_insert(dict, g_strdup("Default"), 
@@ -2764,6 +3101,30 @@ update_audio_presets(signal_user_data_t *ud)
        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);
+}
+
 void
 enforce_preset_type(signal_user_data_t *ud, const GValue *path)
 {
@@ -2794,7 +3155,213 @@ enforce_preset_type(signal_user_data_t *ud, const GValue *path)
        }
 }
 
-void
+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("Export 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(".");
+       }
+       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)
+       {
+               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))
+               {
+                       gtk_widget_destroy(dialog);
+                       g_free(filename);
+                       return;
+               }
+               array = ghb_plist_parse_file(filename);
+               g_free(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)
+                       {
+                               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);
+               }
+               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);
+       }
+       gtk_widget_destroy(dialog);
+}
+
+G_MODULE_EXPORT void
+preset_export_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
+{
+       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')
+       {
+               exportDir = g_strdup(".");
+       }
+       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)
+       {
+               GValue *export, *dict, *array;
+               FILE *file;
+               gchar  *dir;
+
+               filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
+
+               // 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);
+}
+
+G_MODULE_EXPORT void
 presets_save_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 {
        GtkWidget *dialog;
@@ -2857,19 +3424,20 @@ presets_save_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
                {
                        // 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
+G_MODULE_EXPORT void
 preset_name_changed_cb(GtkWidget *entry, signal_user_data_t *ud)
 {
        gchar *name;
@@ -2885,7 +3453,7 @@ preset_name_changed_cb(GtkWidget *entry, signal_user_data_t *ud)
        ghb_value_free(dest);
 }
 
-void
+G_MODULE_EXPORT void
 presets_restore_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 {
        GValue *preset;
@@ -2899,7 +3467,7 @@ presets_restore_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
        ghb_select_preset(ud->builder, preset);
 }
 
-void
+G_MODULE_EXPORT void
 presets_remove_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 {
        GtkTreeView *treeview;
@@ -2968,7 +3536,7 @@ presets_remove_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 }
 
 // controls where valid drop locations are
-gboolean
+G_MODULE_EXPORT gboolean
 presets_drag_motion_cb(
        GtkTreeView *tv,
        GdkDragContext *ctx,
@@ -2988,6 +3556,11 @@ presets_drag_motion_cb(
        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));
@@ -3059,7 +3632,7 @@ presets_drag_motion_cb(
        return TRUE;
 }
 
-void 
+G_MODULE_EXPORT void 
 presets_drag_cb(
        GtkTreeView *dstwidget, 
        GdkDragContext *dc, 
@@ -3217,10 +3790,21 @@ presets_row_expanded_cb(
 {
        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)
        {
@@ -3231,7 +3815,6 @@ presets_row_expanded_cb(
        if (!expanded)
        {
                GValue *presets = NULL;
-               GValue *dict;
                gint *more_indices, count, ii;
 
                more_indices = g_malloc((len+1)*sizeof(gint));
@@ -3262,10 +3845,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;
+       gboolean keep_aspect;
+       gint pic_par;
        keep_aspect = ghb_settings_get_boolean(ud->settings, "PictureKeepRatio");
-       anamorphic = ghb_settings_get_boolean(ud->settings, "anamorphic");
-       if (!(keep_aspect || anamorphic))
+       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]));
@@ -3293,7 +3877,7 @@ preset_update_title_deps(signal_user_data_t *ud, ghb_title_info_t *tinfo)
        }
 }
 
-void
+G_MODULE_EXPORT void
 presets_list_selection_changed_cb(GtkTreeSelection *selection, signal_user_data_t *ud)
 {
        GtkTreeModel *store;
@@ -3336,13 +3920,14 @@ presets_list_selection_changed_cb(GtkTreeSelection *selection, signal_user_data_
                        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);
-                       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);
+                       ghb_set_scale (ud, GHB_PIC_KEEP_PAR);
+                       ud->dont_clear_presets = FALSE;
 
                        gdouble vqmin, vqmax, step, page;
                        gint digits;
@@ -3391,7 +3976,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;
@@ -3411,7 +3996,7 @@ 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)
 {
        GValue *preset;