#include <config.h>
#include <gtk/gtk.h>
+#include <gst/gst.h>
#include <glib/gstdio.h>
#include <gio/gio.h>
+#include <libnotify/notify.h>
+#include "hb.h"
#include "renderer_button.h"
#include "hb-backend.h"
#include "ghb-dvd.h"
#include "settings.h"
#include "resources.h"
#include "presets.h"
+#include "preview.h"
+#include "ghbcompositor.h"
/*
GtkBuilder*
create_builder_or_die(const gchar * name)
{
- guint res;
+ guint res = 0;
GValue *gval;
+ GError *error = NULL;
const gchar *ghb_ui;
const gchar *markup =
N_("<b><big>Unable to create %s.</big></b>\n"
"\n"
- "Internal error. Could not parse UI description.\n");
+ "Internal error. Could not parse UI description.\n"
+ "%s");
g_debug("create_builder_or_die ()\n");
GtkBuilder *xml = gtk_builder_new();
gval = ghb_resource_get("ghb-ui");
ghb_ui = g_value_get_string(gval);
if (xml != NULL)
- res = gtk_builder_add_from_string(xml, ghb_ui, -1, NULL);
+ res = gtk_builder_add_from_string(xml, ghb_ui, -1, &error);
if (!xml || !res)
{
GtkWidget *dialog = gtk_message_dialog_new_with_markup(NULL,
GTK_MESSAGE_ERROR,
GTK_BUTTONS_CLOSE,
_(markup),
- name);
+ name, error->message);
gtk_dialog_run(GTK_DIALOG(dialog));
gtk_widget_destroy(dialog);
exit(EXIT_FAILURE);
g_debug("bind_chapter_tree_model ()\n");
treeview = GTK_TREE_VIEW(GHB_WIDGET (ud->builder, "chapters_list"));
selection = gtk_tree_view_get_selection (treeview);
- treestore = gtk_list_store_new(3, G_TYPE_INT, G_TYPE_STRING, G_TYPE_BOOLEAN);
+ treestore = gtk_list_store_new(4, G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN);
gtk_tree_view_set_model(treeview, GTK_TREE_MODEL(treestore));
cell = ghb_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes(
- _("Chapter No."), cell, "text", 0, NULL);
+ _("Index"), cell, "text", 0, NULL);
+ gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column));
+
+ cell = ghb_cell_renderer_text_new();
+ column = gtk_tree_view_column_new_with_attributes(
+ _("Duration"), cell, "text", 1, NULL);
gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column));
cell = ghb_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes(
- _("Chapter Title"), cell, "text", 1, "editable", 2, NULL);
+ _("Title"), cell, "text", 2, "editable", 3, NULL);
gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column));
g_signal_connect(cell, "key-press-event", chapter_keypress_cb, ud);
g_debug("Done\n");
}
+
extern void queue_list_selection_changed_cb(void);
extern void queue_remove_clicked_cb(void);
extern void queue_list_size_allocate_cb(void);
extern void presets_list_selection_changed_cb(void);
extern void presets_drag_cb(void);
extern void presets_drag_motion_cb(void);
+extern void presets_row_expanded_cb(void);
// Create and bind the tree model to the tree view for the preset list
// Also, connect up the signal that lets us know the selection has changed
g_signal_connect(treeview, "drag_data_received", presets_drag_cb, ud);
g_signal_connect(treeview, "drag_motion", presets_drag_motion_cb, ud);
+ g_signal_connect(treeview, "row_expanded", presets_row_expanded_cb, ud);
+ g_signal_connect(treeview, "row_collapsed", presets_row_expanded_cb, ud);
g_signal_connect(selection, "changed", presets_list_selection_changed_cb, ud);
widget = GHB_WIDGET (ud->builder, "presets_remove");
gtk_widget_set_sensitive(widget, FALSE);
}
// Open activity log.
// TODO: Put this in the same directory as the encode destination
- config = ghb_get_user_config_dir();
+ config = ghb_get_user_config_dir(NULL);
path = g_strdup_printf("%s/%s", config, "Activity.log");
ud->activity_log = g_io_channel_new_file (path, "w", NULL);
+ ud->job_activity_log = NULL;
ghb_ui_update(ud, "activity_location", ghb_string_value(path));
g_free(path);
g_free(config);
int mm_support();
void x264_entry_changed_cb(GtkWidget *widget, signal_user_data_t *ud);
+void preview_window_expose_cb(void);
+
+// Some style definitions for the preview window and hud
+const gchar *hud_rcstyle =
+"style \"ghb-entry\" {\n"
+"GtkEntry::inner-border = {2,2,1,1}\n"
+"}\n"
+"style \"ghb-combo\" {\n"
+"xthickness = 1\n"
+"ythickness = 1\n"
+"}\n"
+"style \"ghb-preview\" {\n"
+"bg[NORMAL]=\"black\"\n"
+"}\n"
+"style \"ghb-hud\" {\n"
+"bg[NORMAL]=\"gray18\"\n"
+"bg[ACTIVE]=\"gray32\"\n"
+"bg[PRELIGHT]=\"gray46\"\n"
+"bg[SELECTED]=\"black\"\n"
+"base[NORMAL]=\"gray40\"\n"
+"text[NORMAL]=\"white\"\n"
+"text[ACTIVE]=\"white\"\n"
+"fg[NORMAL]=\"white\"\n"
+"fg[ACTIVE]=\"white\"\n"
+"fg[PRELIGHT]=\"white\"\n"
+"}\n"
+"widget_class \"*.GtkComboBox.GtkToggleButton\" style \"ghb-combo\"\n"
+"widget_class \"*.GtkEntry\" style \"ghb-entry\"\n"
+"widget \"preview_window.*.preview_hud.*\" style \"ghb-hud\"\n"
+"widget \"preview_window\" style \"ghb-preview\"\n";
int
main (int argc, char *argv[])
{
- GtkWidget *window;
signal_user_data_t *ud;
GValue *preset;
GError *error = NULL;
textdomain (GETTEXT_PACKAGE);
#endif
+ if (!g_thread_supported())
+ g_thread_init(NULL);
context = g_option_context_new ("- Rip and encode DVD or MPEG file");
g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
g_option_context_add_group (context, gtk_get_option_group (TRUE));
+ g_option_context_add_group (context, gst_init_get_option_group ());
g_option_context_parse (context, &argc, &argv, &error);
g_option_context_free(context);
gtk_set_locale ();
gtk_init (&argc, &argv);
+ gtk_rc_parse_string(hud_rcstyle);
+ notify_init("HandBrake");
ghb_register_transforms();
ghb_resource_init();
ghb_load_icons();
ghb_hal_init();
#endif
- ud = g_malloc(sizeof(signal_user_data_t));
+ ud = g_malloc0(sizeof(signal_user_data_t));
ud->debug = ghb_debug;
- ud->cancel_encode = FALSE;
g_log_set_handler (NULL, G_LOG_LEVEL_DEBUG, debug_log_handler, ud);
+ g_log_set_handler ("Gtk", G_LOG_LEVEL_WARNING, warn_log_handler, ud);
+ //g_log_set_handler ("Gtk", G_LOG_LEVEL_CRITICAL, warn_log_handler, ud);
ud->settings = ghb_settings_new();
- ud->queue = NULL;
- ud->current_job = NULL;
- ud->current_dvd_device = NULL;
- ud->dont_clear_presets = FALSE;
// Enable events that alert us to media change events
watch_volumes (ud);
ud->builder = create_builder_or_die (BUILDER_NAME);
+
+ //GtkWidget *widget = GHB_WIDGET(ud->builder, "PictureDetelecineCustom");
+ //gtk_entry_set_inner_border(widget, 2);
+
+ // Set up the "hud" control overlay for the preview window
+ GtkWidget *draw, *hud, *blender, *align;
+
+ align = GHB_WIDGET(ud->builder, "preview_window_alignment");
+ draw = GHB_WIDGET(ud->builder, "preview_image");
+ hud = GHB_WIDGET(ud->builder, "preview_hud");
+
+ // Set up compositing for hud
+ blender = ghb_compositor_new();
+
+ gtk_container_add(GTK_CONTAINER(align), blender);
+ ghb_compositor_zlist_insert(GHB_COMPOSITOR(blender), draw, 1, 1);
+ ghb_compositor_zlist_insert(GHB_COMPOSITOR(blender), hud, 2, .85);
+ gtk_widget_show(blender);
+
// Redirect stderr to the activity window
+ ghb_preview_init(ud);
IoRedirect(ud);
+ ghb_log( "%s - %s - %s",
+ HB_PROJECT_TITLE, HB_PROJECT_BUILD_TITLE, HB_PROJECT_URL_WEBSITE );
ghb_init_dep_map();
// Need to connect x264_options textview buffer to the changed signal
g_signal_connect(buffer, "changed", (GCallback)x264_entry_changed_cb, ud);
ghb_file_menu_add_dvd(ud);
- ghb_backend_init(ud->builder, 1, 0);
+ ghb_combo_init(ud->builder);
g_debug("ud %p\n", ud);
g_debug("ud->builder %p\n", ud->builder);
ghb_presets_load();
ghb_prefs_load(ud);
- // Start the show.
- window = GHB_WIDGET (ud->builder, "hb_window");
- gtk_widget_show (window);
-
ghb_prefs_to_ui(ud);
+ gint logLevel;
+ logLevel = ghb_settings_get_int(ud->settings, "LoggingLevel");
+ ghb_backend_init(logLevel);
+
if (ghb_settings_get_boolean(ud->settings, "hbfd"))
{
ghb_hbfd(ud, TRUE);
}
- gboolean tweaks = ghb_settings_get_boolean(ud->settings, "allow_tweaks");
- GtkWidget *widget;
- widget = GHB_WIDGET(ud->builder, "PictureDeinterlace");
- tweaks ? gtk_widget_hide(widget) : gtk_widget_show(widget);
- widget = GHB_WIDGET(ud->builder, "tweak_PictureDeinterlace");
- !tweaks ? gtk_widget_hide(widget) : gtk_widget_show(widget);
-
- widget = GHB_WIDGET(ud->builder, "PictureDenoise");
- tweaks ? gtk_widget_hide(widget) : gtk_widget_show(widget);
- widget = GHB_WIDGET(ud->builder, "tweak_PictureDenoise");
- !tweaks ? gtk_widget_hide(widget) : gtk_widget_show(widget);
-
gchar *source = ghb_settings_get_string(ud->settings, "default_source");
ghb_dvd_set_current(source, ud);
g_free(source);
}
// Reload and check status of the last saved queue
g_idle_add((GSourceFunc)ghb_reload_queue, ud);
+ if (ghb_settings_get_boolean(ud->settings, "check_updates"))
+ {
+ g_thread_create((GThreadFunc)ghb_check_update, ud, FALSE, NULL);
+ }
// Start timer for monitoring libhb status, 500ms
g_timeout_add (500, ghb_timer_cb, (gpointer)ud);
// Everything should be go-to-go. Lets rock!
+
gtk_main ();
ghb_backend_close();
if (ud->queue)
ghb_value_free(ud->settings);
g_io_channel_unref(ud->activity_log);
ghb_settings_close();
+ notify_uninit();
g_free(ud);
return 0;
}
OSDN Git Service
