dd = ghb_value_boolean(val);
ghb_ui_update(ud, "PictureDeinterlaceDecomb", ghb_boolean_value(!dd));
}
+ val = ghb_dict_lookup(dict, "PictureHeight");
+ if (val != NULL)
+ {
+ ghb_ui_update(ud, "scale_height", val);
+ }
+ val = ghb_dict_lookup(dict, "PictureWidth");
+ if (val != NULL)
+ {
+ ghb_ui_update(ud, "scale_width", val);
+ }
}
}
#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)
{
void
ghb_save_queue(GValue *queue)
{
- store_plist(queue, "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()
{
- return load_plist("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()
{
- remove_plist("queue");
+ pid_t pid;
+ char *path;
+
+ pid = getpid();
+ path = g_strdup_printf ("queue.%d", pid);
+ remove_plist(path);
+ g_free(path);
}
typedef struct
{"10", "10"},
{"12", "12"},
{"15", "15"},
- {"23.976", "23.976"},
+ {"23.976 (NTSC Film)", "23.976"},
{"24", "24"},
- {"25", "25"},
- {"29.97", "29.97"},
+ {"25 (PAL Film/Video)", "25"},
+ {"29.97 (NTSC Video)", "29.97"},
{NULL, NULL}
};
GHashTableIter iter;
gchar *key;
GValue *value;
- gboolean autoscale;
gint *indices, len, count;
gint *def_indices, def_len;
const gchar *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));
&iter, (gpointer*)(void*)&key, (gpointer*)(void*)&value))
{
const GValue *gval;
- gchar *key2;
- key2 = key;
- if (!autoscale)
- {
- if (strcmp(key, "PictureWidth") == 0)
- {
- key2 = "scale_width";
- }
- else if (strcmp(key, "PictureHeight") == 0)
- {
- key2 = "scale_height";
- }
- }
- gval = ghb_settings_get_value(ud->settings, key2);
+ gval = ghb_settings_get_value(ud->settings, key);
if (gval == NULL)
{
continue;
ghb_boolean_value_new(FALSE));
presets_list_insert(ud, indices, len);
}
+ if (!ghb_settings_get_boolean( ud->settings, "PictureWidthEnable"))
+ {
+ ghb_dict_remove(dict, "PictureWidth");
+ }
+ if (!ghb_settings_get_boolean( ud->settings, "PictureHeightEnable"))
+ {
+ ghb_dict_remove(dict, "PictureHeight");
+ }
+ ghb_dict_insert(dict, g_strdup("autoscale"),
+ ghb_boolean_value_new(
+ !ghb_settings_get_boolean( ud->settings, "PictureWidthEnable") &&
+ !ghb_settings_get_boolean( ud->settings, "PictureHeightEnable")
+ )
+ );
store_presets();
ud->dont_clear_presets = TRUE;
// Make the new preset the selected item
return;
}
array = ghb_plist_parse_file(filename);
- g_free(filename);
import_xlat_presets(array);
presets_clear_default(array);
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();
}
gtk_widget_destroy(dialog);
}
const gchar *description = "";
gint count, *indices, len;
- g_debug("presets_save_clicked_cb ()");
+ g_debug("presets_new_folder_clicked_cb ()");
preset = ghb_settings_get_value (ud->settings, "preset_selection");
count = ghb_array_len(preset);
{
description = g_value_get_string(
ghb_dict_lookup(dict, "PresetDescription"));
- ghb_ui_update(ud, "PresetDescription", ghb_string_value(description));
+ ghb_ui_update(ud, "FolderDescription", ghb_string_value(description));
}
- 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"));
+ desc = GTK_TEXT_VIEW(GHB_WIDGET(ud->builder, "FolderDescription"));
+ dialog = GHB_WIDGET(ud->builder, "preset_new_folder_dialog");
+ entry = GTK_ENTRY(GHB_WIDGET(ud->builder, "FolderName"));
gtk_entry_set_text(entry, name);
response = gtk_dialog_run(GTK_DIALOG(dialog));
gtk_widget_hide(dialog);
}
}
ghb_array_append(dest, ghb_string_value_new(name));
- ghb_widget_to_setting(ud->settings, GTK_WIDGET(desc));
+ GValue *val = ghb_widget_value(GTK_WIDGET(desc));
+ ghb_settings_set_value(ud->settings, "PresetDescription", val);
folder_save(ud, dest);
ghb_value_free(dest);
}
count = 1;
desc = GTK_TEXT_VIEW(GHB_WIDGET(ud->builder, "PresetDescription"));
+ int width = ghb_settings_get_int(ud->settings, "PictureWidth");
+ int height = ghb_settings_get_int(ud->settings, "PictureHeight");
+ gboolean autoscale = ghb_settings_get_boolean(ud->settings, "autoscale");
+ ghb_ui_update(ud, "PictureWidthEnable",
+ ghb_boolean_value(width!=0&&!autoscale));
+ ghb_ui_update(ud, "PictureHeightEnable",
+ ghb_boolean_value(height!=0&&!autoscale));
+ if (!width)
+ {
+ width = ghb_settings_get_int(ud->settings, "scale_width");
+ ghb_ui_update(ud, "PictureWidth", ghb_int_value(width));
+ }
+ if (!height)
+ {
+ height = ghb_settings_get_int(ud->settings, "scale_height");
+ ghb_ui_update(ud, "PictureHeight", ghb_int_value(height));
+ }
dialog = GHB_WIDGET(ud->builder, "preset_save_dialog");
entry = GTK_ENTRY(GHB_WIDGET(ud->builder, "PresetName"));
gtk_entry_set_text(entry, name);
if (!folder)
{
ud->dont_clear_presets = TRUE;
+ ud->scale_busy = 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
{
preset_update_title_deps(ud, &tinfo);
}
- ghb_set_scale (ud, GHB_PIC_KEEP_PAR);
+ ud->scale_busy = FALSE;
+ ghb_set_scale (ud, GHB_PIC_KEEP_PAR|GHB_PIC_USE_MAX);
ud->dont_clear_presets = FALSE;
gdouble vqmin, vqmax, step, page;
if (!folder)
{
ud->dont_clear_presets = TRUE;
+ ud->scale_busy = 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
{
preset_update_title_deps(ud, &tinfo);
}
- ghb_set_scale (ud, GHB_PIC_KEEP_PAR);
+ ud->scale_busy = FALSE;
+ ghb_set_scale (ud, GHB_PIC_KEEP_PAR|GHB_PIC_USE_MAX);
ud->dont_clear_presets = FALSE;
gdouble vqmin, vqmax, step, page;