From: Petri H. <phi...@us...> - 2017-07-21 15:13:04
|
# HG changeset patch # User Petri Hintukainen <phi...@us...> # Date 1500649891 -10800 # Node ID 2be1bbf6a33e108639ae3693e85fdd70a7f5940a # Branch default # Parent 3dc32541c3628a283276c039aa1c14a5e45dc66d Avoid using deprecatd gtk_init_add() diff --git a/src/engine.c b/src/engine.c --- a/src/engine.c +++ b/src/engine.c @@ -486,16 +486,14 @@ g_async_queue_ref (js_queue); } -static gboolean -engine_startup_cb (gpointer data) +void +engine_startup (void) { /* note: order of actions is significant */ queue_available = TRUE; g_signal_connect (G_OBJECT (app), "client-event", G_CALLBACK (js_queue_cb), NULL); js_queue_cb (NULL, NULL, NULL); - gxine_init_done (); - return FALSE; } void @@ -528,8 +526,6 @@ se_startup_cmds = load_user_startup_script (); se_eval (gse, se_startup_cmds, NULL, NULL, NULL, _("Startup script")); - - gxine_init_add (engine_startup_cb, NULL); } void --git a/src/engine.h b/src/engine.h --- a/src/engine.h +++ b/src/engine.h @@ -24,6 +24,7 @@ #include "script_engine.h" void engine_init (void); +void engine_startup (void); void engine_startup_script (void); void save_startup_script (void); --git a/src/main.c b/src/main.c --- a/src/main.c +++ b/src/main.c @@ -221,8 +221,8 @@ static gboolean main_start_play (gpointer data) { - if (gxine_init_count) - return TRUE; + //if (gxine_init_count) + // return TRUE; playlist_play (*(int *)data); return FALSE; } @@ -841,7 +841,6 @@ post_init_configure (); initialised = TRUE; - gxine_init_add (ui_post_init, NULL); playlist_logo ((gpointer) 1); /* @@ -872,6 +871,11 @@ if (cmd) se_eval (gse, cmd, NULL, NULL, NULL, "--command"); + engine_startup (); + noskin_post_init (); + noskin_main_post_init (fullscreen); + ui_post_init (); + //gdk_threads_enter(); gtk_main(); //gdk_threads_leave(); --git a/src/noskin_window.c b/src/noskin_window.c --- a/src/noskin_window.c +++ b/src/noskin_window.c @@ -719,7 +719,7 @@ } #endif -static gboolean noskin_main_init_cb (gpointer fullscreen) +void noskin_main_post_init (gint fullscreen) { gtk_widget_add_events (app, GDK_KEY_RELEASE_MASK); g_object_connect (G_OBJECT (app), @@ -752,8 +752,6 @@ GDK_WINDOW_XWINDOW (app->window), RevertToParent, CurrentTime); */ - gxine_init_done (); - return FALSE; } /* initialisation */ @@ -809,7 +807,7 @@ NULL); } -static gboolean noskin_post_init (gboolean unused) +void noskin_post_init (void) { xine_cfg_entry_t entry; if (xine_config_lookup_entry (xine, "gui.window_size", &entry)) @@ -819,9 +817,6 @@ } if (xine_config_lookup_entry (xine, "gui.windowed_mode.magnify_lowres_video", &entry)) gtk_video_set_auto_rescale ((GtkVideo *)gtv, entry.num_value); - - gxine_init_done (); - return FALSE; } @@ -900,8 +895,6 @@ if (xine_config_lookup_entry (xine, "gui.windowed_mode.auto_resize", &entry)) gtk_video_set_auto_resize ((GtkVideo *)gtv, entry.num_value); - gxine_init_add ((GSourceFunc) noskin_post_init, NULL); - if (!wm_toolbar) { /* @@ -1044,6 +1037,5 @@ (unsigned char *)&have_video, 1); #endif - gxine_init_add ((GSourceFunc) noskin_main_init_cb, GINT_TO_POINTER (fullscreen)); g_timeout_add (500, update_slider_cb, NULL); } --git a/src/noskin_window.h b/src/noskin_window.h --- a/src/noskin_window.h +++ b/src/noskin_window.h @@ -26,6 +26,9 @@ void noskin_main_init (const char *video_driver_id, const gchar *geometry, gboolean fullscreen); void noskin_main_close (void); +void noskin_post_init (void); +void noskin_main_post_init (gint fullscreen); + void app_show (void); void app_hide (void); --git a/src/ui.c b/src/ui.c --- a/src/ui.c +++ b/src/ui.c @@ -1118,7 +1118,7 @@ } } -gboolean ui_post_init (gpointer data) +void ui_post_init (void) { unsigned int i; uint32_t cap = gtk_video_get_capabilities ((GtkVideo *)gtv); @@ -1145,9 +1145,6 @@ #endif } gdk_threads_leave (); - - gxine_init_done (); - return FALSE; } /* Undo button */ --git a/src/ui.h b/src/ui.h --- a/src/ui.h +++ b/src/ui.h @@ -220,6 +220,6 @@ void window_fs_stickiness_update (gboolean); void ui_init (void); -gboolean ui_post_init (gpointer); +void ui_post_init (void); #endif --git a/src/utils.h b/src/utils.h --- a/src/utils.h +++ b/src/utils.h @@ -108,17 +108,6 @@ const char *get_copyright_notice (void); -int gxine_init_count; -static inline void gxine_init_add (GSourceFunc func, gpointer data) -{ - ++gxine_init_count; - gtk_init_add (func, data); -} -static inline void gxine_init_done (void) -{ - --gxine_init_count; -} - void config_update_default (const char *key, int value); const char *const *gxine_list_video_output_plugins (xine_t *xine); |