From 9e5941ed387a56966938799abb118d1a6aafdf5c Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Thu, 22 Sep 2016 11:43:34 +0200 Subject: examples: emotion: fix event naming after convert to EFL Canvas Object In commit 7b90e1147442d6a8023422400bffd77e2815fe0b the event names changed but examples have not been updated. --- src/examples/emotion/emotion_basic_example.c | 2 +- src/examples/emotion/emotion_border_example.c | 12 ++++++------ src/examples/emotion/emotion_generic_example.c | 12 ++++++------ .../emotion/emotion_generic_subtitle_example.c | 2 +- src/examples/emotion/emotion_signals_example.c | 18 +++++++++--------- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/examples/emotion/emotion_basic_example.c b/src/examples/emotion/emotion_basic_example.c index c7a2417ade..8698ff2551 100644 --- a/src/examples/emotion/emotion_basic_example.c +++ b/src/examples/emotion/emotion_basic_example.c @@ -63,7 +63,7 @@ main(int argc, const char *argv[]) emotion_object_init(em, NULL); efl_event_callback_add - (em, EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _playback_started_cb, NULL); + (em, EFL_CANVAS_VIDEO_EVENT_PLAYBACK_START, _playback_started_cb, NULL); emotion_object_file_set(em, filename); diff --git a/src/examples/emotion/emotion_border_example.c b/src/examples/emotion/emotion_border_example.c index c3088b77a1..65bdd98060 100644 --- a/src/examples/emotion/emotion_border_example.c +++ b/src/examples/emotion/emotion_border_example.c @@ -30,7 +30,7 @@ _create_emotion_object(Evas *e) emotion_object_init(em, "gstreamer1"); - efl_event_callback_add(em, EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _playback_started_cb, NULL); + efl_event_callback_add(em, EFL_CANVAS_VIDEO_EVENT_PLAYBACK_START, _playback_started_cb, NULL); return em; } @@ -156,11 +156,11 @@ _canvas_resize_cb(Ecore_Evas *ee) } EFL_CALLBACKS_ARRAY_DEFINE(emotion_object_example_callbacks, - { EMOTION_OBJECT_EVENT_FRAME_DECODE, _frame_decode_cb }, - { EMOTION_OBJECT_EVENT_LENGTH_CHANGE, _length_change_cb }, - { EMOTION_OBJECT_EVENT_POSITION_UPDATE, _position_update_cb }, - { EMOTION_OBJECT_EVENT_PROGRESS_CHANGE, _progress_change_cb }, - { EMOTION_OBJECT_EVENT_FRAME_RESIZE, _frame_resize_cb }); + { EFL_CANVAS_VIDEO_EVENT_FRAME_DECODE, _frame_decode_cb }, + { EFL_CANVAS_VIDEO_EVENT_LENGTH_CHANGE, _length_change_cb }, + { EFL_CANVAS_VIDEO_EVENT_POSITION_CHANGE, _position_update_cb }, + { EFL_CANVAS_VIDEO_EVENT_PROGRESS_CHANGE, _progress_change_cb }, + { EFL_CANVAS_VIDEO_EVENT_FRAME_RESIZE, _frame_resize_cb }); int main(int argc, const char *argv[]) diff --git a/src/examples/emotion/emotion_generic_example.c b/src/examples/emotion/emotion_generic_example.c index ec52c65b02..f766e44afa 100644 --- a/src/examples/emotion/emotion_generic_example.c +++ b/src/examples/emotion/emotion_generic_example.c @@ -40,9 +40,9 @@ _create_emotion_object(Evas *e) emotion_object_init(em, "generic"); efl_event_callback_add - (em, EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _playback_started_cb, NULL); + (em, EFL_CANVAS_VIDEO_EVENT_PLAYBACK_START, _playback_started_cb, NULL); efl_event_callback_add - (em, EMOTION_OBJECT_EVENT_PLAYBACK_FINISHED, _playback_stopped_cb, NULL); + (em, EFL_CANVAS_VIDEO_EVENT_PLAYBACK_STOP, _playback_stopped_cb, NULL); return em; } @@ -153,10 +153,10 @@ _progress_change_cb(void *data EINA_UNUSED, const Efl_Event *ev) } EFL_CALLBACKS_ARRAY_DEFINE(emotion_object_example_callbacks, - { EMOTION_OBJECT_EVENT_FRAME_DECODE, _frame_decode_cb }, - { EMOTION_OBJECT_EVENT_LENGTH_CHANGE, _length_change_cb }, - { EMOTION_OBJECT_EVENT_POSITION_UPDATE, _position_update_cb }, - { EMOTION_OBJECT_EVENT_PROGRESS_CHANGE, _progress_change_cb }); + { EFL_CANVAS_VIDEO_EVENT_FRAME_DECODE, _frame_decode_cb }, + { EFL_CANVAS_VIDEO_EVENT_LENGTH_CHANGE, _length_change_cb }, + { EFL_CANVAS_VIDEO_EVENT_POSITION_CHANGE, _position_update_cb }, + { EFL_CANVAS_VIDEO_EVENT_PROGRESS_CHANGE, _progress_change_cb }); int main(int argc, const char *argv[]) diff --git a/src/examples/emotion/emotion_generic_subtitle_example.c b/src/examples/emotion/emotion_generic_subtitle_example.c index b5124c6d81..de396b3e20 100644 --- a/src/examples/emotion/emotion_generic_subtitle_example.c +++ b/src/examples/emotion/emotion_generic_subtitle_example.c @@ -78,7 +78,7 @@ main(int argc, const char *argv[]) emotion_object_video_subtitle_file_set(em, subtitle_filename); efl_event_callback_add - (em, EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _playback_started_cb, NULL); + (em, EFL_CANVAS_VIDEO_EVENT_PLAYBACK_START, _playback_started_cb, NULL); emotion_object_file_set(em, filename); diff --git a/src/examples/emotion/emotion_signals_example.c b/src/examples/emotion/emotion_signals_example.c index 76d68007d4..5864802bef 100644 --- a/src/examples/emotion/emotion_signals_example.c +++ b/src/examples/emotion/emotion_signals_example.c @@ -58,7 +58,7 @@ static void _position_update_cb(void *data EINA_UNUSED, const Efl_Event *ev) { printf(">>> Emotion object first position update.\n"); - efl_event_callback_del(ev->object, EMOTION_OBJECT_EVENT_POSITION_UPDATE, _position_update_cb, NULL); + efl_event_callback_del(ev->object, EFL_CANVAS_VIDEO_EVENT_POSITION_CHANGE, _position_update_cb, NULL); _display_info(ev->object); } @@ -66,7 +66,7 @@ static void _frame_decode_cb(void *data EINA_UNUSED, const Efl_Event *ev) { printf(">>> Emotion object first frame decode.\n"); - efl_event_callback_del(ev->object, EMOTION_OBJECT_EVENT_FRAME_DECODE, _frame_decode_cb, NULL); + efl_event_callback_del(ev->object, EFL_CANVAS_VIDEO_EVENT_FRAME_DECODE, _frame_decode_cb, NULL); _display_info(ev->object); } @@ -85,13 +85,13 @@ _frame_resize_cb(void *data EINA_UNUSED, const Efl_Event *ev) } EFL_CALLBACKS_ARRAY_DEFINE(emotion_object_example_callbacks, - { EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _playback_started_cb }, - { EMOTION_OBJECT_EVENT_PLAYBACK_FINISHED, _playback_finished_cb }, - { EMOTION_OBJECT_EVENT_OPEN_DONE, _open_done_cb }, - { EMOTION_OBJECT_EVENT_POSITION_UPDATE, _position_update_cb }, - { EMOTION_OBJECT_EVENT_FRAME_DECODE, _frame_decode_cb }, - { EMOTION_OBJECT_EVENT_DECODE_STOP, _decode_stop_cb }, - { EMOTION_OBJECT_EVENT_FRAME_RESIZE, _frame_resize_cb }); + { EFL_CANVAS_VIDEO_EVENT_PLAYBACK_START, _playback_started_cb }, + { EFL_CANVAS_VIDEO_EVENT_PLAYBACK_STOP, _playback_finished_cb }, + { EFL_CANVAS_VIDEO_EVENT_OPEN_DONE, _open_done_cb }, + { EFL_CANVAS_VIDEO_EVENT_POSITION_CHANGE, _position_update_cb }, + { EFL_CANVAS_VIDEO_EVENT_FRAME_DECODE, _frame_decode_cb }, + { EFL_CANVAS_VIDEO_EVENT_PLAYBACK_STOP, _decode_stop_cb }, + { EFL_CANVAS_VIDEO_EVENT_FRAME_RESIZE, _frame_resize_cb }); int main(int argc, const char *argv[]) -- cgit v1.2.1