dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

examples: emotion: fix event naming after convert to EFL Canvas Object 

In commit 7b90e11474 the event names changed
but examples have not been updated.
This commit is contained in:
Stefan Schmidt 2016-09-22 11:43:34 +02:00
parent 97a2d7ff33
commit 9e5941ed38
5 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/examples/emotion/emotion_basic_example.c
View File

@ -63,7 +63,7 @@ main(int argc, const char *argv[])
emotion_object_init(em, NULL); emotion_object_init(em, NULL);
efl_event_callback_add 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); emotion_object_file_set(em, filename);

12
src/examples/emotion/emotion_border_example.c
View File

@ -30,7 +30,7 @@ _create_emotion_object(Evas *e)
emotion_object_init(em, "gstreamer1"); 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; return em;
} }
@ -156,11 +156,11 @@ _canvas_resize_cb(Ecore_Evas *ee)
} }
EFL_CALLBACKS_ARRAY_DEFINE(emotion_object_example_callbacks, EFL_CALLBACKS_ARRAY_DEFINE(emotion_object_example_callbacks,
{ EMOTION_OBJECT_EVENT_FRAME_DECODE, _frame_decode_cb }, { EFL_CANVAS_VIDEO_EVENT_FRAME_DECODE, _frame_decode_cb },
{ EMOTION_OBJECT_EVENT_LENGTH_CHANGE, _length_change_cb }, { EFL_CANVAS_VIDEO_EVENT_LENGTH_CHANGE, _length_change_cb },
{ EMOTION_OBJECT_EVENT_POSITION_UPDATE, _position_update_cb }, { EFL_CANVAS_VIDEO_EVENT_POSITION_CHANGE, _position_update_cb },
{ EMOTION_OBJECT_EVENT_PROGRESS_CHANGE, _progress_change_cb }, { EFL_CANVAS_VIDEO_EVENT_PROGRESS_CHANGE, _progress_change_cb },
{ EMOTION_OBJECT_EVENT_FRAME_RESIZE, _frame_resize_cb }); { EFL_CANVAS_VIDEO_EVENT_FRAME_RESIZE, _frame_resize_cb });
int int
main(int argc, const char *argv[]) main(int argc, const char *argv[])

12
src/examples/emotion/emotion_generic_example.c
View File

@ -40,9 +40,9 @@ _create_emotion_object(Evas *e)
emotion_object_init(em, "generic"); emotion_object_init(em, "generic");
efl_event_callback_add 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 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; 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, EFL_CALLBACKS_ARRAY_DEFINE(emotion_object_example_callbacks,
{ EMOTION_OBJECT_EVENT_FRAME_DECODE, _frame_decode_cb }, { EFL_CANVAS_VIDEO_EVENT_FRAME_DECODE, _frame_decode_cb },
{ EMOTION_OBJECT_EVENT_LENGTH_CHANGE, _length_change_cb }, { EFL_CANVAS_VIDEO_EVENT_LENGTH_CHANGE, _length_change_cb },
{ EMOTION_OBJECT_EVENT_POSITION_UPDATE, _position_update_cb }, { EFL_CANVAS_VIDEO_EVENT_POSITION_CHANGE, _position_update_cb },
{ EMOTION_OBJECT_EVENT_PROGRESS_CHANGE, _progress_change_cb }); { EFL_CANVAS_VIDEO_EVENT_PROGRESS_CHANGE, _progress_change_cb });
int int
main(int argc, const char *argv[]) main(int argc, const char *argv[])

2
src/examples/emotion/emotion_generic_subtitle_example.c
View File

@ -78,7 +78,7 @@ main(int argc, const char *argv[])
emotion_object_video_subtitle_file_set(em, subtitle_filename); emotion_object_video_subtitle_file_set(em, subtitle_filename);
efl_event_callback_add 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); emotion_object_file_set(em, filename);

18
src/examples/emotion/emotion_signals_example.c
View File

@ -58,7 +58,7 @@ static void
_position_update_cb(void *data EINA_UNUSED, const Efl_Event *ev) _position_update_cb(void *data EINA_UNUSED, const Efl_Event *ev)
{ {
printf(">>> Emotion object first position update.\n"); 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); _display_info(ev->object);
} }
@ -66,7 +66,7 @@ static void
_frame_decode_cb(void *data EINA_UNUSED, const Efl_Event *ev) _frame_decode_cb(void *data EINA_UNUSED, const Efl_Event *ev)
{ {
printf(">>> Emotion object first frame decode.\n"); 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); _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, EFL_CALLBACKS_ARRAY_DEFINE(emotion_object_example_callbacks,
{ EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _playback_started_cb }, { EFL_CANVAS_VIDEO_EVENT_PLAYBACK_START, _playback_started_cb },
{ EMOTION_OBJECT_EVENT_PLAYBACK_FINISHED, _playback_finished_cb }, { EFL_CANVAS_VIDEO_EVENT_PLAYBACK_STOP, _playback_finished_cb },
{ EMOTION_OBJECT_EVENT_OPEN_DONE, _open_done_cb }, { EFL_CANVAS_VIDEO_EVENT_OPEN_DONE, _open_done_cb },
{ EMOTION_OBJECT_EVENT_POSITION_UPDATE, _position_update_cb }, { EFL_CANVAS_VIDEO_EVENT_POSITION_CHANGE, _position_update_cb },
{ EMOTION_OBJECT_EVENT_FRAME_DECODE, _frame_decode_cb }, { EFL_CANVAS_VIDEO_EVENT_FRAME_DECODE, _frame_decode_cb },
{ EMOTION_OBJECT_EVENT_DECODE_STOP, _decode_stop_cb }, { EFL_CANVAS_VIDEO_EVENT_PLAYBACK_STOP, _decode_stop_cb },
{ EMOTION_OBJECT_EVENT_FRAME_RESIZE, _frame_resize_cb }); { EFL_CANVAS_VIDEO_EVENT_FRAME_RESIZE, _frame_resize_cb });
int int
main(int argc, const char *argv[]) main(int argc, const char *argv[])