summaryrefslogtreecommitdiff
path: root/src/modules/ethumb/emotion/emotion.c
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-03-01 18:06:28 +0000
committerTom Hacohen <tom@stosb.com>2016-03-03 09:58:08 +0000
commitf21ade6123b9053fca8d1632644c48525a99d6e0 (patch)
treec5eb0445f471d21365a7a5a7b0ec7d279c11b398 /src/modules/ethumb/emotion/emotion.c
parent3faf3f3fc68a839f06b311c35ba020cb25e7c9c4 (diff)
Automatic migration to Eo4.
I just ran my script (email to follow) to migrate all of the EFL automatically. This commit is *only* the automatic conversion, so it can be easily reverted and re-run.
Diffstat (limited to 'src/modules/ethumb/emotion/emotion.c')
-rw-r--r--src/modules/ethumb/emotion/emotion.c24
1 files changed, 10 insertions, 14 deletions
diff --git a/src/modules/ethumb/emotion/emotion.c b/src/modules/ethumb/emotion/emotion.c
index 792b0db..e9a9eee 100644
--- a/src/modules/ethumb/emotion/emotion.c
+++ b/src/modules/ethumb/emotion/emotion.c
@@ -214,12 +214,9 @@ _finish_thumb_generation(struct _emotion_plugin *_plugin, int success)
214{ 214{
215 int r = 0; 215 int r = 0;
216 216
217 eo_do(_plugin->video, eo_event_callback_del( 217 eo_event_callback_del(_plugin->video, EMOTION_OBJECT_EVENT_FRAME_RESIZE, _frame_resized_cb, _plugin);
218 EMOTION_OBJECT_EVENT_FRAME_RESIZE, _frame_resized_cb, _plugin)); 218 eo_event_callback_del(_plugin->video, EMOTION_OBJECT_EVENT_FRAME_DECODE, _frame_decode_cb, _plugin);
219 eo_do(_plugin->video, eo_event_callback_del( 219 eo_event_callback_del(_plugin->video, EMOTION_OBJECT_EVENT_DECODE_STOP, _video_stopped_cb, _plugin);
220 EMOTION_OBJECT_EVENT_FRAME_DECODE, _frame_decode_cb, _plugin));
221 eo_do(_plugin->video, eo_event_callback_del(
222 EMOTION_OBJECT_EVENT_DECODE_STOP, _video_stopped_cb, _plugin));
223 220
224 emotion_object_play_set(_plugin->video, 0); 221 emotion_object_play_set(_plugin->video, 0);
225 222
@@ -263,8 +260,7 @@ _frame_grab_single(void *data)
263 260
264 ethumb_image_save(e); 261 ethumb_image_save(e);
265 262
266 eo_do(_plugin->video, eo_event_callback_del( 263 eo_event_callback_del(_plugin->video, EMOTION_OBJECT_EVENT_FRAME_RESIZE, _frame_resized_cb, _plugin);
267 EMOTION_OBJECT_EVENT_FRAME_RESIZE, _frame_resized_cb, _plugin));
268 264
269 emotion_object_play_set(_plugin->video, 0); 265 emotion_object_play_set(_plugin->video, 0);
270 266
@@ -407,12 +403,12 @@ _thumb_generate(Ethumb *e)
407 _plugin->pcount = 1; 403 _plugin->pcount = 1;
408 404
409 _resize_movie(_plugin); 405 _resize_movie(_plugin);
410 eo_do(o, eo_event_callback_add 406 eo_event_callback_add
411 (EMOTION_OBJECT_EVENT_FRAME_DECODE, _frame_decode_cb, _plugin)); 407 (o, EMOTION_OBJECT_EVENT_FRAME_DECODE, _frame_decode_cb, _plugin);
412 eo_do(o, eo_event_callback_add 408 eo_event_callback_add
413 (EMOTION_OBJECT_EVENT_FRAME_RESIZE,_frame_resized_cb, _plugin)); 409 (o, EMOTION_OBJECT_EVENT_FRAME_RESIZE, _frame_resized_cb, _plugin);
414 eo_do(o, eo_event_callback_add 410 eo_event_callback_add
415 (EMOTION_OBJECT_EVENT_DECODE_STOP, _video_stopped_cb, _plugin)); 411 (o, EMOTION_OBJECT_EVENT_DECODE_STOP, _video_stopped_cb, _plugin);
416 412
417 if (f == ETHUMB_THUMB_EET) 413 if (f == ETHUMB_THUMB_EET)
418 { 414 {