From 4686d20b47208169c68ed418fc1879458c1fc1b8 Mon Sep 17 00:00:00 2001 From: Lucas De Marchi Date: Thu, 8 Jul 2010 00:51:55 +0000 Subject: [PATCH] Fixes for Ecore Api changes Patch automatically by Coccinelle to fix the callbacks used by the following functions: * ecore_event_handler_add() * ecore_event_filter_add() * ecore_idler_add() * ecore_idle_enterer_add() * ecore_idle_enterer_before_add() * ecore_idle_exiter_add() * ecore_main_fd_handler_add() * ecore_main_win32_handler_add() * ecore_timer_add() * ecore_timer_loop_add() * ecore_animator_add() * ecore_poller_add() SVN revision: 50099 --- legacy/emotion/src/bin/emotion_test_main.c | 8 ++++---- .../src/modules/gstreamer/emotion_gstreamer.c | 6 +++--- legacy/emotion/src/modules/xine/emotion_xine.c | 12 ++++++------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/legacy/emotion/src/bin/emotion_test_main.c b/legacy/emotion/src/bin/emotion_test_main.c index 7977945579..bc06aa1ed8 100644 --- a/legacy/emotion/src/bin/emotion_test_main.c +++ b/legacy/emotion/src/bin/emotion_test_main.c @@ -23,7 +23,7 @@ struct _Frame_Data static int main_start(int argc, char **argv); static void main_stop(void); static void main_resize(Ecore_Evas *ee); -static int main_signal_exit(void *data, int ev_type, void *ev); +static Eina_Bool main_signal_exit(void *data, int ev_type, void *ev); static void main_delete_request(Ecore_Evas *ee); static void bg_setup(void); @@ -150,7 +150,7 @@ main_resize(Ecore_Evas *ee) bg_resize(w, h); } -static int +static Eina_Bool main_signal_exit(void *data, int ev_type, void *ev) { ecore_main_loop_quit(); @@ -161,7 +161,7 @@ main_signal_exit(void *data, int ev_type, void *ev) video_objs = eina_list_remove_list(video_objs, video_objs); printf("done\n"); } - return 1; + return EINA_TRUE; } static void @@ -778,7 +778,7 @@ enter_idle(void *data) return 1; } -static int +static Eina_Bool check_positions(void *data) { const Eina_List *lst; diff --git a/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c b/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c index 5ef24d2f3b..1f612de41f 100644 --- a/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c +++ b/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c @@ -12,7 +12,7 @@ #include "Emotion.h" /* Callbacks to get the eos */ -static int _eos_timer_fct (void *data); +static Eina_Bool _eos_timer_fct (void *data); static void _em_buffer_read(void *data, void *buffer, unsigned int nbyte); static void _for_each_tag (GstTagList const* list, gchar const* tag, void *data); static void _free_metadata (Emotion_Gstreamer_Metadata *m); @@ -1381,7 +1381,7 @@ _em_buffer_read(void *data, void *buf, unsigned int nbyte __UNUSED__) } } -static int +static Eina_Bool _eos_timer_fct(void *data) { Emotion_Gstreamer_Video *ev; @@ -1431,5 +1431,5 @@ _eos_timer_fct(void *data) } gst_message_unref(msg); } - return 1; + return EINA_TRUE; } diff --git a/legacy/emotion/src/modules/xine/emotion_xine.c b/legacy/emotion/src/modules/xine/emotion_xine.c index f489f8556f..61d2585845 100644 --- a/legacy/emotion/src/modules/xine/emotion_xine.c +++ b/legacy/emotion/src/modules/xine/emotion_xine.c @@ -61,10 +61,10 @@ static const char *em_meta_get (void *ef, int meta); /* internal util calls */ static void *_em_slave (void *par); static void _em_slave_event (void *data, int type, void *arg); -static int _em_fd_active (void *data, Ecore_Fd_Handler *fdh); +static Eina_Bool _em_fd_active (void *data, Ecore_Fd_Handler *fdh); static void _em_event (void *data, const xine_event_t *event); static void _em_module_event (void *data, int type); -static int _em_fd_ev_active (void *data, Ecore_Fd_Handler *fdh); +static Eina_Bool _em_fd_ev_active (void *data, Ecore_Fd_Handler *fdh); //static int _em_timer (void *data); static void *_em_get_pos_len_th(void *par); static void _em_get_pos_len (Emotion_Xine_Video *ev); @@ -1139,7 +1139,7 @@ em_meta_get(void *ef, int meta) return NULL; } -static int +static Eina_Bool _em_fd_active(void *data, Ecore_Fd_Handler *fdh) { void *buf; @@ -1171,7 +1171,7 @@ _em_fd_active(void *data, Ecore_Fd_Handler *fdh) } } } - return 1; + return EINA_TRUE; } static void @@ -1218,7 +1218,7 @@ _em_module_event(void *data, int type) write(ev->fd_ev_write, buf, sizeof(buf)); } -static int +static Eina_Bool _em_fd_ev_active(void *data, Ecore_Fd_Handler *fdh) { int fd, len; @@ -1372,7 +1372,7 @@ _em_fd_ev_active(void *data, Ecore_Fd_Handler *fdh) free(eev); } } - return 1; + return EINA_TRUE; } static void *