summaryrefslogtreecommitdiff
path: root/src/modules/ethumb
diff options
context:
space:
mode:
authorYeshwanth Reddivari <r.yeshwanth@samsung.com>2016-09-21 10:37:59 -0700
committerCedric BAIL <cedric@osg.samsung.com>2016-09-21 11:04:34 -0700
commit7b90e1147442d6a8023422400bffd77e2815fe0b (patch)
tree779d696049dd14b9111e80573a6c9b34814e6601 /src/modules/ethumb
parentcbfcfdf3e90906e31f8defc65d17747c28e19f57 (diff)
emotion: convert Emotion_Object into Efl.Canvas.Video
Reviewers: singh.amitesh, raster, jpeg, cedric Differential Revision: https://phab.enlightenment.org/D3994 Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
Diffstat (limited to 'src/modules/ethumb')
-rw-r--r--src/modules/ethumb/emotion/emotion.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/modules/ethumb/emotion/emotion.c b/src/modules/ethumb/emotion/emotion.c
index de2dd62413..efa32a5e5b 100644
--- a/src/modules/ethumb/emotion/emotion.c
+++ b/src/modules/ethumb/emotion/emotion.c
@@ -210,9 +210,9 @@ _finish_thumb_generation(struct _emotion_plugin *_plugin, int success)
210{ 210{
211 int r = 0; 211 int r = 0;
212 212
213 efl_event_callback_del(_plugin->video, EMOTION_OBJECT_EVENT_FRAME_RESIZE, _frame_resized_cb, _plugin); 213 efl_event_callback_del(_plugin->video, EFL_CANVAS_VIDEO_EVENT_FRAME_RESIZE, _frame_resized_cb, _plugin);
214 efl_event_callback_del(_plugin->video, EMOTION_OBJECT_EVENT_FRAME_DECODE, _frame_decode_cb, _plugin); 214 efl_event_callback_del(_plugin->video, EFL_CANVAS_VIDEO_EVENT_FRAME_DECODE, _frame_decode_cb, _plugin);
215 efl_event_callback_del(_plugin->video, EMOTION_OBJECT_EVENT_DECODE_STOP, _video_stopped_cb, _plugin); 215 efl_event_callback_del(_plugin->video, EFL_CANVAS_VIDEO_EVENT_PLAYBACK_STOP, _video_stopped_cb, _plugin);
216 216
217 emotion_object_play_set(_plugin->video, 0); 217 emotion_object_play_set(_plugin->video, 0);
218 218
@@ -243,8 +243,8 @@ _frame_grab_single(void *data)
243 243
244 if (_plugin->len <= 0) 244 if (_plugin->len <= 0)
245 { 245 {
246 _video_pos_set(_plugin); 246 _video_pos_set(_plugin);
247 return EINA_TRUE; 247 return EINA_TRUE;
248 } 248 }
249 249
250 p = emotion_object_position_get(_plugin->video); 250 p = emotion_object_position_get(_plugin->video);
@@ -256,7 +256,7 @@ _frame_grab_single(void *data)
256 256
257 ethumb_image_save(e); 257 ethumb_image_save(e);
258 258
259 efl_event_callback_del(_plugin->video, EMOTION_OBJECT_EVENT_FRAME_RESIZE, _frame_resized_cb, _plugin); 259 efl_event_callback_del(_plugin->video, EFL_CANVAS_VIDEO_EVENT_FRAME_RESIZE, _frame_resized_cb, _plugin);
260 260
261 emotion_object_play_set(_plugin->video, 0); 261 emotion_object_play_set(_plugin->video, 0);
262 262
@@ -376,10 +376,10 @@ _thumb_generate(Ethumb *e)
376 if (!r) 376 if (!r)
377 { 377 {
378 ERR("Could not initialize emotion object."); 378 ERR("Could not initialize emotion object.");
379 evas_object_del(o); 379 evas_object_del(o);
380 ethumb_finished_callback_call(e, 0); 380 ethumb_finished_callback_call(e, 0);
381 free(_plugin); 381 free(_plugin);
382 return NULL; 382 return NULL;
383 } 383 }
384 384
385 _plugin->video = o; 385 _plugin->video = o;
@@ -400,15 +400,15 @@ _thumb_generate(Ethumb *e)
400 400
401 _resize_movie(_plugin); 401 _resize_movie(_plugin);
402 efl_event_callback_add 402 efl_event_callback_add
403 (o, EMOTION_OBJECT_EVENT_FRAME_DECODE, _frame_decode_cb, _plugin); 403 (o, EFL_CANVAS_VIDEO_EVENT_FRAME_DECODE, _frame_decode_cb, _plugin);
404 efl_event_callback_add 404 efl_event_callback_add
405 (o, EMOTION_OBJECT_EVENT_FRAME_RESIZE, _frame_resized_cb, _plugin); 405 (o, EFL_CANVAS_VIDEO_EVENT_FRAME_RESIZE, _frame_resized_cb, _plugin);
406 efl_event_callback_add 406 efl_event_callback_add
407 (o, EMOTION_OBJECT_EVENT_DECODE_STOP, _video_stopped_cb, _plugin); 407 (o, EFL_CANVAS_VIDEO_EVENT_PLAYBACK_STOP, _video_stopped_cb, _plugin);
408 408
409 if (f == ETHUMB_THUMB_EET) 409 if (f == ETHUMB_THUMB_EET)
410 { 410 {
411 _generate_animated_thumb(_plugin); 411 _generate_animated_thumb(_plugin);
412 } 412 }
413 413
414 _video_pos_set(_plugin); 414 _video_pos_set(_plugin);