summaryrefslogtreecommitdiff
path: root/src/modules
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/modules/ethumb/emotion/emotion.c9
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_preload.c5
2 files changed, 5 insertions, 9 deletions
diff --git a/src/modules/ethumb/emotion/emotion.c b/src/modules/ethumb/emotion/emotion.c
index ee2cdfedc0..792b0dba6c 100644
--- a/src/modules/ethumb/emotion/emotion.c
+++ b/src/modules/ethumb/emotion/emotion.c
@@ -81,8 +81,7 @@ _resize_movie(struct _emotion_plugin *_plugin)
81} 81}
82 82
83static Eina_Bool 83static Eina_Bool
84_frame_decode_cb(void *data, 84_frame_decode_cb(void *data, const Eo_Event *event EINA_UNUSED)
85 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
86{ 85{
87 struct _emotion_plugin *_plugin = data; 86 struct _emotion_plugin *_plugin = data;
88 87
@@ -95,8 +94,7 @@ _frame_decode_cb(void *data,
95 } 94 }
96 95
97static Eina_Bool 96static Eina_Bool
98_frame_resized_cb(void *data, 97_frame_resized_cb(void *data, const Eo_Event *event EINA_UNUSED)
99 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
100{ 98{
101 _resize_movie(data); 99 _resize_movie(data);
102 100
@@ -104,8 +102,7 @@ _frame_resized_cb(void *data,
104} 102}
105 103
106static Eina_Bool 104static Eina_Bool
107_video_stopped_cb(void *data, 105_video_stopped_cb(void *data, const Eo_Event *event EINA_UNUSED)
108 Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
109{ 106{
110 struct _emotion_plugin *_plugin = data; 107 struct _emotion_plugin *_plugin = data;
111 108
diff --git a/src/modules/evas/engines/gl_common/evas_gl_preload.c b/src/modules/evas/engines/gl_common/evas_gl_preload.c
index 9c3b1357ea..e566cb780b 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_preload.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_preload.c
@@ -300,12 +300,11 @@ evas_gl_preload_render_relax(evas_gl_make_current_cb make_current, void *engine_
300} 300}
301 301
302static Eina_Bool 302static Eina_Bool
303_evas_gl_preload_target_die(void *data, Eo *obj, 303_evas_gl_preload_target_die(void *data, const Eo_Event *event)
304 const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
305{ 304{
306 Evas_GL_Texture *tex = data; 305 Evas_GL_Texture *tex = data;
307 306
308 evas_gl_preload_target_unregister(tex, obj); 307 evas_gl_preload_target_unregister(tex, event->obj);
309 308
310 return EO_CALLBACK_CONTINUE; 309 return EO_CALLBACK_CONTINUE;
311} 310}