X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=gtk%2Fsrc%2Fmain.c;h=e67b3db13514d848708d6a9f5e9d6d22462f99e5;hb=546645566708444b0da1942315c42f77d07d6d7f;hp=370086fddc27254e39be4bcf67facc539225cd96;hpb=8433fbca4f4b2dfdf139ca45c741f61bf529019e;p=handbrake-jp%2Fhandbrake-jp-git.git diff --git a/gtk/src/main.c b/gtk/src/main.c index 370086fd..e67b3db1 100644 --- a/gtk/src/main.c +++ b/gtk/src/main.c @@ -33,10 +33,19 @@ #include #include + +#if !defined(_WIN32) #include +#include +#else +#include +#include +//#include +#define pipe(phandles) _pipe (phandles, 4096, _O_BINARY) +#endif + #include #include -#include #include "hb.h" #include "renderer_button.h" #include "hb-backend.h" @@ -50,6 +59,7 @@ #include "resources.h" #include "presets.h" #include "preview.h" +#include "ghbcompositor.h" /* @@ -75,7 +85,6 @@ #endif - #define BUILDER_NAME "ghb" GtkBuilder* @@ -83,18 +92,20 @@ create_builder_or_die(const gchar * name) { guint res = 0; GValue *gval; + GError *error = NULL; const gchar *ghb_ui; const gchar *markup = N_("Unable to create %s.\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, @@ -102,7 +113,7 @@ create_builder_or_die(const gchar * name) GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, _(markup), - name); + name, error->message); gtk_dialog_run(GTK_DIALOG(dialog)); gtk_widget_destroy(dialog); exit(EXIT_FAILURE); @@ -190,9 +201,9 @@ change_font(GtkWidget *widget, gpointer data) //gtk_container_foreach((GtkContainer*)window, change_font, "sans 20"); #endif -extern void chapter_list_selection_changed_cb(void); -extern void chapter_edited_cb(void); -extern void chapter_keypress_cb(void); +extern G_MODULE_EXPORT void chapter_list_selection_changed_cb(void); +extern G_MODULE_EXPORT void chapter_edited_cb(void); +extern G_MODULE_EXPORT void chapter_keypress_cb(void); // Create and bind the tree model to the tree view for the chapter list // Also, connect up the signal that lets us know the selection has changed @@ -233,11 +244,11 @@ bind_chapter_tree_model (signal_user_data_t *ud) } -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 queue_drag_cb(void); -extern void queue_drag_motion_cb(void); +extern G_MODULE_EXPORT void queue_list_selection_changed_cb(void); +extern G_MODULE_EXPORT void queue_remove_clicked_cb(void); +extern G_MODULE_EXPORT void queue_list_size_allocate_cb(void); +extern G_MODULE_EXPORT void queue_drag_cb(void); +extern G_MODULE_EXPORT void queue_drag_motion_cb(void); // Create and bind the tree model to the tree view for the queue list // Also, connect up the signal that lets us know the selection has changed @@ -301,7 +312,7 @@ bind_queue_tree_model (signal_user_data_t *ud) gtk_widget_hide (widget); } -extern void audio_list_selection_changed_cb(void); +extern G_MODULE_EXPORT void audio_list_selection_changed_cb(void); // Create and bind the tree model to the tree view for the audio track list // Also, connect up the signal that lets us know the selection has changed @@ -366,9 +377,9 @@ bind_audio_tree_model (signal_user_data_t *ud) g_debug("Done\n"); } -extern void presets_list_selection_changed_cb(void); -extern void presets_drag_cb(void); -extern void presets_drag_motion_cb(void); +extern G_MODULE_EXPORT void presets_list_selection_changed_cb(void); +extern G_MODULE_EXPORT void presets_drag_cb(void); +extern G_MODULE_EXPORT 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 @@ -441,8 +452,12 @@ IoRedirect(signal_user_data_t *ud) g_free(config); // Set encoding to raw. g_io_channel_set_encoding (ud->activity_log, NULL, NULL); +#if !defined(_WIN32) stderr->_fileno = pfd[1]; - stdin->_fileno = pfd[0]; +#else + stderr->_file = pfd[1]; +#endif + setvbuf(stderr, NULL, _IONBF, 0); channel = g_io_channel_unix_new (pfd[0]); // I was getting an this error: // "Invalid byte sequence in conversion input" @@ -469,36 +484,81 @@ static GOptionEntry entries[] = { NULL } }; -#if defined(__linux__) -void drive_changed_cb(GVolumeMonitor *gvm, GDrive *gd, signal_user_data_t *ud); +G_MODULE_EXPORT void drive_changed_cb(GVolumeMonitor *gvm, GDrive *gd, signal_user_data_t *ud); //void drive_disconnected_cb(GnomeVFSVolumeMonitor *gvm, GnomeVFSDrive *gd, signal_user_data_t *ud); +#if defined(_WIN32) +G_MODULE_EXPORT GdkFilterReturn +win_message_cb(GdkXEvent *wmevent, GdkEvent *event, gpointer data) +{ + signal_user_data_t *ud = (signal_user_data_t*)data; + MSG *msg = (MSG*)wmevent; + + if (msg->message == WM_DEVICECHANGE) + { + wm_drive_changed(wmevent, ud); + } + return GDK_FILTER_CONTINUE; +} +#endif + void watch_volumes(signal_user_data_t *ud) { +#if !defined(_WIN32) GVolumeMonitor *gvm; gvm = g_volume_monitor_get (); g_signal_connect(gvm, "drive-changed", (GCallback)drive_changed_cb, ud); - //g_signal_connect(gvm, "drive-connected", (GCallback)drive_connected_cb, ud); -} #else -void -watch_volumes(signal_user_data_t *ud) -{ -} + GdkWindow *window; + GtkWidget *widget; + + widget = GHB_WIDGET (ud->builder, "hb_window"); + window = gtk_widget_get_parent_window(widget); + gdk_window_add_filter(window, win_message_cb, ud); #endif +} // Hack to avoid a segfault in libavcodec extern int mm_flags; int mm_support(); -void x264_entry_changed_cb(GtkWidget *widget, signal_user_data_t *ud); +G_MODULE_EXPORT 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; @@ -511,23 +571,33 @@ main (int argc, char *argv[]) textdomain (GETTEXT_PACKAGE); #endif +#ifdef PTW32_STATIC_LIB + pthread_win32_process_attach_np(); + pthread_win32_thread_attach_np(); +#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)); +#if !defined(_WIN32) g_option_context_add_group (context, gst_init_get_option_group ()); +#endif 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); +#if !defined(_WIN32) notify_init("HandBrake"); +#endif ghb_register_transforms(); ghb_resource_init(); ghb_load_icons(); -#if defined(__linux__) +#if !defined(_WIN32) ghb_hal_init(); #endif @@ -537,14 +607,33 @@ main (int argc, char *argv[]) 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->builder = create_builder_or_die (BUILDER_NAME); // 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_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 @@ -576,10 +665,6 @@ main (int argc, char *argv[]) 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; @@ -632,18 +717,6 @@ main (int argc, char *argv[]) g_timeout_add (500, ghb_timer_cb, (gpointer)ud); // Everything should be go-to-go. Lets rock! - // Create floating window over preview image - GtkWidget *widget; - GdkWindow *parent, *win; - - widget = GHB_WIDGET(ud->builder, "preview_image"); - gtk_widget_realize(widget); - parent = gtk_widget_get_window(widget); - widget = GHB_WIDGET(ud->builder, "preview_hud"); - gtk_widget_realize(widget); - win = gtk_widget_get_window(widget); - gdk_window_reparent(win, parent, 0, 0); - gtk_main (); ghb_backend_close(); if (ud->queue) @@ -651,8 +724,13 @@ main (int argc, char *argv[]) ghb_value_free(ud->settings); g_io_channel_unref(ud->activity_log); ghb_settings_close(); +#if !defined(_WIN32) notify_uninit(); +#endif g_free(ud); +#ifdef PTW32_STATIC_LIB + pthread_win32_thread_detach_np(); + pthread_win32_process_detach_np(); +#endif return 0; } -