summaryrefslogtreecommitdiff
path: root/legacy/emotion
diff options
context:
space:
mode:
authorLucas De Marchi <lucas.demarchi@profusion.mobi>2010-07-08 00:51:55 +0000
committerLucas De Marchi <lucas.demarchi@profusion.mobi>2010-07-08 00:51:55 +0000
commit4686d20b47208169c68ed418fc1879458c1fc1b8 (patch)
treea60744fe2fa9b53f7b149e5f7fac84b5d70449e5 /legacy/emotion
parent3f941f2e461abd71226006ffdfa41e135eb9bc06 (diff)
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
Diffstat (limited to 'legacy/emotion')
-rw-r--r--legacy/emotion/src/bin/emotion_test_main.c8
-rw-r--r--legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c6
-rw-r--r--legacy/emotion/src/modules/xine/emotion_xine.c12
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
23static int main_start(int argc, char **argv); 23static int main_start(int argc, char **argv);
24static void main_stop(void); 24static void main_stop(void);
25static void main_resize(Ecore_Evas *ee); 25static void main_resize(Ecore_Evas *ee);
26static int main_signal_exit(void *data, int ev_type, void *ev); 26static Eina_Bool main_signal_exit(void *data, int ev_type, void *ev);
27static void main_delete_request(Ecore_Evas *ee); 27static void main_delete_request(Ecore_Evas *ee);
28 28
29static void bg_setup(void); 29static void bg_setup(void);
@@ -150,7 +150,7 @@ main_resize(Ecore_Evas *ee)
150 bg_resize(w, h); 150 bg_resize(w, h);
151} 151}
152 152
153static int 153static Eina_Bool
154main_signal_exit(void *data, int ev_type, void *ev) 154main_signal_exit(void *data, int ev_type, void *ev)
155{ 155{
156 ecore_main_loop_quit(); 156 ecore_main_loop_quit();
@@ -161,7 +161,7 @@ main_signal_exit(void *data, int ev_type, void *ev)
161 video_objs = eina_list_remove_list(video_objs, video_objs); 161 video_objs = eina_list_remove_list(video_objs, video_objs);
162 printf("done\n"); 162 printf("done\n");
163 } 163 }
164 return 1; 164 return EINA_TRUE;
165} 165}
166 166
167static void 167static void
@@ -778,7 +778,7 @@ enter_idle(void *data)
778 return 1; 778 return 1;
779} 779}
780 780
781static int 781static Eina_Bool
782check_positions(void *data) 782check_positions(void *data)
783{ 783{
784 const Eina_List *lst; 784 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 @@
12#include "Emotion.h" 12#include "Emotion.h"
13 13
14/* Callbacks to get the eos */ 14/* Callbacks to get the eos */
15static int _eos_timer_fct (void *data); 15static Eina_Bool _eos_timer_fct (void *data);
16static void _em_buffer_read(void *data, void *buffer, unsigned int nbyte); 16static void _em_buffer_read(void *data, void *buffer, unsigned int nbyte);
17static void _for_each_tag (GstTagList const* list, gchar const* tag, void *data); 17static void _for_each_tag (GstTagList const* list, gchar const* tag, void *data);
18static void _free_metadata (Emotion_Gstreamer_Metadata *m); 18static void _free_metadata (Emotion_Gstreamer_Metadata *m);
@@ -1381,7 +1381,7 @@ _em_buffer_read(void *data, void *buf, unsigned int nbyte __UNUSED__)
1381 } 1381 }
1382} 1382}
1383 1383
1384static int 1384static Eina_Bool
1385_eos_timer_fct(void *data) 1385_eos_timer_fct(void *data)
1386{ 1386{
1387 Emotion_Gstreamer_Video *ev; 1387 Emotion_Gstreamer_Video *ev;
@@ -1431,5 +1431,5 @@ _eos_timer_fct(void *data)
1431 } 1431 }
1432 gst_message_unref(msg); 1432 gst_message_unref(msg);
1433 } 1433 }
1434 return 1; 1434 return EINA_TRUE;
1435} 1435}
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);
61/* internal util calls */ 61/* internal util calls */
62static void *_em_slave (void *par); 62static void *_em_slave (void *par);
63static void _em_slave_event (void *data, int type, void *arg); 63static void _em_slave_event (void *data, int type, void *arg);
64static int _em_fd_active (void *data, Ecore_Fd_Handler *fdh); 64static Eina_Bool _em_fd_active (void *data, Ecore_Fd_Handler *fdh);
65static void _em_event (void *data, const xine_event_t *event); 65static void _em_event (void *data, const xine_event_t *event);
66static void _em_module_event (void *data, int type); 66static void _em_module_event (void *data, int type);
67static int _em_fd_ev_active (void *data, Ecore_Fd_Handler *fdh); 67static Eina_Bool _em_fd_ev_active (void *data, Ecore_Fd_Handler *fdh);
68//static int _em_timer (void *data); 68//static int _em_timer (void *data);
69static void *_em_get_pos_len_th(void *par); 69static void *_em_get_pos_len_th(void *par);
70static void _em_get_pos_len (Emotion_Xine_Video *ev); 70static void _em_get_pos_len (Emotion_Xine_Video *ev);
@@ -1139,7 +1139,7 @@ em_meta_get(void *ef, int meta)
1139 return NULL; 1139 return NULL;
1140} 1140}
1141 1141
1142static int 1142static Eina_Bool
1143_em_fd_active(void *data, Ecore_Fd_Handler *fdh) 1143_em_fd_active(void *data, Ecore_Fd_Handler *fdh)
1144{ 1144{
1145 void *buf; 1145 void *buf;
@@ -1171,7 +1171,7 @@ _em_fd_active(void *data, Ecore_Fd_Handler *fdh)
1171 } 1171 }
1172 } 1172 }
1173 } 1173 }
1174 return 1; 1174 return EINA_TRUE;
1175} 1175}
1176 1176
1177static void 1177static void
@@ -1218,7 +1218,7 @@ _em_module_event(void *data, int type)
1218 write(ev->fd_ev_write, buf, sizeof(buf)); 1218 write(ev->fd_ev_write, buf, sizeof(buf));
1219} 1219}
1220 1220
1221static int 1221static Eina_Bool
1222_em_fd_ev_active(void *data, Ecore_Fd_Handler *fdh) 1222_em_fd_ev_active(void *data, Ecore_Fd_Handler *fdh)
1223{ 1223{
1224 int fd, len; 1224 int fd, len;
@@ -1372,7 +1372,7 @@ _em_fd_ev_active(void *data, Ecore_Fd_Handler *fdh)
1372 free(eev); 1372 free(eev);
1373 } 1373 }
1374 } 1374 }
1375 return 1; 1375 return EINA_TRUE;
1376} 1376}
1377 1377
1378static void * 1378static void *