X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=gtk%2Fsrc%2Fcallbacks.c;h=ec29ff6c054d8e56bfcd54e04bd999cb2b2a825f;hb=0884cb45aeeb60a46effe1d1056a61fe68300ea7;hp=246f56b92e46431d3b03b4e4b2d70fff01fd8fe4;hpb=52d2419a149fd0ccf4f0baddd2b17dbc1c516fb0;p=handbrake-jp%2Fhandbrake-jp-git.git diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c index 246f56b9..ec29ff6c 100644 --- a/gtk/src/callbacks.c +++ b/gtk/src/callbacks.c @@ -22,17 +22,22 @@ #if !defined(_WIN32) #include -#include +#define G_UDEV_API_IS_SUBJECT_TO_CHANGE 1 +#include #include #include #include #include + +#if !defined(_NO_UPDATE_CHECK) #if defined(_OLD_WEBKIT) #include #else #include #endif +#endif + #include #include #else @@ -199,7 +204,7 @@ ghb_check_dependency( type = GTK_WIDGET_TYPE(widget); if (type == GTK_TYPE_COMBO_BOX || type == GTK_TYPE_COMBO_BOX_ENTRY) if (gtk_combo_box_get_active(GTK_COMBO_BOX(widget)) < 0) return; - name = gtk_widget_get_name(widget); + name = ghb_get_setting_key(widget); } else name = alt_name; @@ -1068,7 +1073,7 @@ dvd_source_activate_cb(GtkAction *action, signal_user_data_t *ud) gchar *sourcename; sourcename = ghb_settings_get_string(ud->settings, "scan_source"); - filename = gtk_action_get_name(action); + filename = gtk_buildable_get_name(GTK_BUILDABLE(action)); ghb_do_scan(ud, filename, 0, TRUE); if (strcmp(sourcename, filename) != 0) { @@ -1694,7 +1699,7 @@ vcodec_changed_cb(GtkWidget *widget, signal_user_data_t *ud) G_MODULE_EXPORT void target_size_changed_cb(GtkWidget *widget, signal_user_data_t *ud) { - const gchar *name = gtk_widget_get_name(widget); + const gchar *name = ghb_get_setting_key(widget); g_debug("target_size_changed_cb () %s", name); ghb_widget_to_setting(ud->settings, widget); ghb_check_dependency(ud, widget, NULL); @@ -1713,7 +1718,7 @@ G_MODULE_EXPORT void start_point_changed_cb(GtkWidget *widget, signal_user_data_t *ud) { gint start, end; - const gchar *name = gtk_widget_get_name(widget); + const gchar *name = ghb_get_setting_key(widget); g_debug("start_point_changed_cb () %s", name); ghb_widget_to_setting(ud->settings, widget); @@ -1765,7 +1770,7 @@ G_MODULE_EXPORT void end_point_changed_cb(GtkWidget *widget, signal_user_data_t *ud) { gint start, end; - const gchar *name = gtk_widget_get_name(widget); + const gchar *name = ghb_get_setting_key(widget); g_debug("end_point_changed_cb () %s", name); ghb_widget_to_setting(ud->settings, widget); @@ -2971,6 +2976,7 @@ ghb_timer_cb(gpointer data) update_preview = FALSE; } +#if !defined(_NO_UPDATE_CHECK) if (!appcast_busy) { gchar *updates; @@ -3001,6 +3007,7 @@ ghb_timer_cb(gpointer data) } } } +#endif return TRUE; } @@ -3588,7 +3595,7 @@ pref_changed_cb(GtkWidget *widget, signal_user_data_t *ud) g_debug("pref_changed_cb"); ghb_widget_to_setting (ud->settings, widget); ghb_check_dependency(ud, widget, NULL); - const gchar *name = gtk_widget_get_name(widget); + const gchar *name = ghb_get_setting_key(widget); ghb_pref_save(ud->settings, name); } @@ -3598,7 +3605,7 @@ use_m4v_changed_cb(GtkWidget *widget, signal_user_data_t *ud) g_debug("use_m4v_changed_cb"); ghb_widget_to_setting (ud->settings, widget); ghb_check_dependency(ud, widget, NULL); - const gchar *name = gtk_widget_get_name(widget); + const gchar *name = ghb_get_setting_key(widget); ghb_pref_save(ud->settings, name); ghb_update_destination_extension(ud); } @@ -3609,7 +3616,7 @@ show_status_cb(GtkWidget *widget, signal_user_data_t *ud) g_debug("show_status_cb"); ghb_widget_to_setting (ud->settings, widget); ghb_check_dependency(ud, widget, NULL); - const gchar *name = gtk_widget_get_name(widget); + const gchar *name = ghb_get_setting_key(widget); ghb_pref_save(ud->settings, name); GtkStatusIcon *si; @@ -3626,7 +3633,7 @@ vqual_granularity_changed_cb(GtkWidget *widget, signal_user_data_t *ud) ghb_widget_to_setting (ud->settings, widget); ghb_check_dependency(ud, widget, NULL); - const gchar *name = gtk_widget_get_name(widget); + const gchar *name = ghb_get_setting_key(widget); ghb_pref_save(ud->settings, name); gdouble vqmin, vqmax, step, page; @@ -3643,7 +3650,7 @@ tweaks_changed_cb(GtkWidget *widget, signal_user_data_t *ud) { g_debug("tweaks_changed_cb"); ghb_widget_to_setting (ud->settings, widget); - const gchar *name = gtk_widget_get_name(widget); + const gchar *name = ghb_get_setting_key(widget); ghb_pref_save(ud->settings, name); } @@ -3652,7 +3659,7 @@ hbfd_feature_changed_cb(GtkWidget *widget, signal_user_data_t *ud) { g_debug("hbfd_feature_changed_cb"); ghb_widget_to_setting (ud->settings, widget); - const gchar *name = gtk_widget_get_name(widget); + const gchar *name = ghb_get_setting_key(widget); ghb_pref_save(ud->settings, name); gboolean hbfd = ghb_settings_get_boolean(ud->settings, "hbfd_feature"); @@ -3785,7 +3792,7 @@ dvd_device_list() } #if !defined(_WIN32) -static LibHalContext *hal_ctx = NULL; +static GUdevClient *udev_ctx = NULL; #endif gboolean @@ -3793,27 +3800,43 @@ ghb_is_cd(GDrive *gd) { #if !defined(_WIN32) gchar *device; - LibHalDrive *halDrive; - LibHalDriveType dtype; + GUdevDevice *udd; - if (hal_ctx == NULL) + if (udev_ctx == NULL) return FALSE; device = g_drive_get_identifier(gd, G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE); if (device == NULL) return FALSE; - halDrive = libhal_drive_from_device_file (hal_ctx, device); + + udd = g_udev_client_query_by_device_file(udev_ctx, device); g_free(device); - if (halDrive == NULL) + + if (udd == NULL) + { + g_message("udev: Failed to lookup device %s", device); return FALSE; - dtype = libhal_drive_get_type(halDrive); - libhal_drive_free(halDrive); - return (dtype == LIBHAL_DRIVE_TYPE_CDROM); + } + + gint val; + val = g_udev_device_get_property_as_int(udd, "ID_CDROM_DVD"); + if (val == 1) + return TRUE; + + return FALSE; #else return FALSE; #endif } +void +ghb_udev_init() +{ +#if !defined(_WIN32) + udev_ctx = g_udev_client_new(NULL); +#endif +} + #if defined(_WIN32) static void handle_media_change(const gchar *device, gboolean insert, signal_user_data_t *ud) @@ -3962,12 +3985,6 @@ drive_changed_cb(GVolumeMonitor *gvm, GDrive *gd, signal_user_data_t *ud) #endif #if !defined(_WIN32) -static void -dbus_init (void) -{ - dbus_g_thread_init(); -} - #define GPM_DBUS_PM_SERVICE "org.freedesktop.PowerManagement" #define GPM_DBUS_PM_PATH "/org/freedesktop/PowerManagement" #define GPM_DBUS_PM_INTERFACE "org.freedesktop.PowerManagement" @@ -4070,11 +4087,11 @@ ghb_suspend_gpm() #endif } +#if !defined(_WIN32) static gboolean ghb_can_shutdown_gpm() { gboolean can_shutdown = FALSE; -#if !defined(_WIN32) DBusGConnection *conn; DBusGProxy *proxy; GError *error = NULL; @@ -4115,14 +4132,14 @@ ghb_can_shutdown_gpm() } g_object_unref(G_OBJECT(proxy)); dbus_g_connection_unref(conn); -#endif return can_shutdown; } +#endif +#if !defined(_WIN32) static void ghb_shutdown_gpm() { -#if !defined(_WIN32) DBusGConnection *conn; DBusGProxy *proxy; GError *error = NULL; @@ -4160,8 +4177,8 @@ ghb_shutdown_gpm() } g_object_unref(G_OBJECT(proxy)); dbus_g_connection_unref(conn); -#endif } +#endif void ghb_inhibit_gpm() @@ -4480,65 +4497,6 @@ ghb_uninhibit_gsm() #endif } -void -ghb_hal_init() -{ -#if !defined(_WIN32) - DBusGConnection *gconn; - DBusConnection *conn; - GError *gerror = NULL; - DBusError error; - char **devices; - int nr; - - dbus_init (); - - if (!(hal_ctx = libhal_ctx_new ())) { - g_warning ("failed to create a HAL context!"); - return; - } - - gconn = dbus_g_bus_get(DBUS_BUS_SYSTEM, &gerror); - if (gerror != NULL) - { - g_warning("DBUS cannot connect: %s", gerror->message); - g_error_free(gerror); - return; - } - conn = dbus_g_connection_get_connection(gconn); - libhal_ctx_set_dbus_connection (hal_ctx, conn); - dbus_error_init (&error); - if (!libhal_ctx_init (hal_ctx, &error)) { - g_warning ("libhal_ctx_init failed: %s", error.message ? error.message : "unknown"); - dbus_error_free (&error); - libhal_ctx_free (hal_ctx); - dbus_g_connection_unref(gconn); - hal_ctx = NULL; - return; - } - - /* - * Do something to ping the HAL daemon - the above functions will - * succeed even if hald is not running, so long as DBUS is. But we - * want to exit silently if hald is not running, to behave on - * pre-2.6 systems. - */ - if (!(devices = libhal_get_all_devices (hal_ctx, &nr, &error))) { - g_warning ("seems that HAL is not running: %s", error.message ? error.message : "unknown"); - dbus_error_free (&error); - - libhal_ctx_shutdown (hal_ctx, NULL); - libhal_ctx_free (hal_ctx); - hal_ctx = NULL; - dbus_g_connection_unref(gconn); - return; - } - - libhal_free_string_array (devices); - dbus_g_connection_unref(gconn); -#endif -} - G_MODULE_EXPORT gboolean tweak_setting_cb( GtkWidget *widget, @@ -4559,7 +4517,7 @@ tweak_setting_cb( GtkResponseType response; gchar *tweak = NULL; - name = gtk_widget_get_name(widget); + name = ghb_get_setting_key(widget); if (g_str_has_prefix(name, "tweak_")) { tweak_name = g_strdup(name); @@ -4656,35 +4614,29 @@ format_drc_cb(GtkScale *scale, gdouble val, signal_user_data_t *ud) G_MODULE_EXPORT gchar* format_vquality_cb(GtkScale *scale, gdouble val, signal_user_data_t *ud) { - gdouble percent; - gint vcodec = ghb_settings_combo_int(ud->settings, "VideoEncoder"); switch (vcodec) { case HB_VCODEC_X264: { - percent = 100. * (51 - val) / 51.; - return g_strdup_printf("RF: %.4g (%.0f%%)", val, percent); + return g_strdup_printf("RF: %.4g", val); } break; case HB_VCODEC_FFMPEG: { - percent = 100. * (30 - (val - 1)) / 30.; - return g_strdup_printf("QP: %d (%.0f%%)", (int)val, percent); + return g_strdup_printf("QP: %d", (int)val); } break; case HB_VCODEC_THEORA: { - percent = 100. * val / 63.; - return g_strdup_printf("QP: %d (%.0f%%)", (int)val, percent); + return g_strdup_printf("QP: %d", (int)val); } break; default: { - percent = 0; } break; } - return g_strdup_printf("QP: %.1f / %.1f%%", val, percent); + return g_strdup_printf("QP: %.4g", val); } static void @@ -4718,6 +4670,7 @@ process_appcast(signal_user_data_t *ud) gtk_label_set_text(GTK_LABEL(label), msg); #if !defined(_WIN32) +#if !defined(_NO_UPDATE_CHECK) if (html == NULL) { html = webkit_web_view_new(); @@ -4729,6 +4682,7 @@ process_appcast(signal_user_data_t *ud) } webkit_web_view_open(WEBKIT_WEB_VIEW(html), description); #endif +#endif dialog = GHB_WIDGET(ud->builder, "update_dialog"); response = gtk_dialog_run(GTK_DIALOG(dialog)); gtk_widget_hide(dialog); @@ -4784,7 +4738,10 @@ ghb_net_recv_cb(GIOChannel *ioc, GIOCondition cond, gpointer data) } if (status == G_IO_STATUS_EOF) { - ud->appcast[ud->appcast_len] = 0; + if ( ud->appcast != NULL ) + { + ud->appcast[ud->appcast_len] = 0; + } ghb_net_close(ioc); process_appcast(ud); return FALSE;