summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schmidt <stefan@osg.samsung.com>2016-09-22 11:43:34 +0200
committerStefan Schmidt <stefan@osg.samsung.com>2016-09-22 11:43:34 +0200
commit9e5941ed387a56966938799abb118d1a6aafdf5c (patch)
tree78a4e9fc8d56253843faba699fe19fa9cd638661
parent97a2d7ff33d9e8493427bf4eb4fdea4163808bf2 (diff)
examples: emotion: fix event naming after convert to EFL Canvas Object
In commit 7b90e1147442d6a8023422400bffd77e2815fe0b the event names changed but examples have not been updated.
-rw-r--r--src/examples/emotion/emotion_basic_example.c2
-rw-r--r--src/examples/emotion/emotion_border_example.c12
-rw-r--r--src/examples/emotion/emotion_generic_example.c12
-rw-r--r--src/examples/emotion/emotion_generic_subtitle_example.c2
-rw-r--r--src/examples/emotion/emotion_signals_example.c18
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 c7a2417..8698ff2 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[])
63 emotion_object_init(em, NULL); 63 emotion_object_init(em, NULL);
64 64
65 efl_event_callback_add 65 efl_event_callback_add
66 (em, EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _playback_started_cb, NULL); 66 (em, EFL_CANVAS_VIDEO_EVENT_PLAYBACK_START, _playback_started_cb, NULL);
67 67
68 emotion_object_file_set(em, filename); 68 emotion_object_file_set(em, filename);
69 69
diff --git a/src/examples/emotion/emotion_border_example.c b/src/examples/emotion/emotion_border_example.c
index c3088b7..65bdd98 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)
30 30
31 emotion_object_init(em, "gstreamer1"); 31 emotion_object_init(em, "gstreamer1");
32 32
33 efl_event_callback_add(em, EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _playback_started_cb, NULL); 33 efl_event_callback_add(em, EFL_CANVAS_VIDEO_EVENT_PLAYBACK_START, _playback_started_cb, NULL);
34 34
35 return em; 35 return em;
36} 36}
@@ -156,11 +156,11 @@ _canvas_resize_cb(Ecore_Evas *ee)
156} 156}
157 157
158EFL_CALLBACKS_ARRAY_DEFINE(emotion_object_example_callbacks, 158EFL_CALLBACKS_ARRAY_DEFINE(emotion_object_example_callbacks,
159 { EMOTION_OBJECT_EVENT_FRAME_DECODE, _frame_decode_cb }, 159 { EFL_CANVAS_VIDEO_EVENT_FRAME_DECODE, _frame_decode_cb },
160 { EMOTION_OBJECT_EVENT_LENGTH_CHANGE, _length_change_cb }, 160 { EFL_CANVAS_VIDEO_EVENT_LENGTH_CHANGE, _length_change_cb },
161 { EMOTION_OBJECT_EVENT_POSITION_UPDATE, _position_update_cb }, 161 { EFL_CANVAS_VIDEO_EVENT_POSITION_CHANGE, _position_update_cb },
162 { EMOTION_OBJECT_EVENT_PROGRESS_CHANGE, _progress_change_cb }, 162 { EFL_CANVAS_VIDEO_EVENT_PROGRESS_CHANGE, _progress_change_cb },
163 { EMOTION_OBJECT_EVENT_FRAME_RESIZE, _frame_resize_cb }); 163 { EFL_CANVAS_VIDEO_EVENT_FRAME_RESIZE, _frame_resize_cb });
164 164
165int 165int
166main(int argc, const char *argv[]) 166main(int argc, const char *argv[])
diff --git a/src/examples/emotion/emotion_generic_example.c b/src/examples/emotion/emotion_generic_example.c
index ec52c65..f766e44 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)
40 emotion_object_init(em, "generic"); 40 emotion_object_init(em, "generic");
41 41
42 efl_event_callback_add 42 efl_event_callback_add
43 (em, EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _playback_started_cb, NULL); 43 (em, EFL_CANVAS_VIDEO_EVENT_PLAYBACK_START, _playback_started_cb, NULL);
44 efl_event_callback_add 44 efl_event_callback_add
45 (em, EMOTION_OBJECT_EVENT_PLAYBACK_FINISHED, _playback_stopped_cb, NULL); 45 (em, EFL_CANVAS_VIDEO_EVENT_PLAYBACK_STOP, _playback_stopped_cb, NULL);
46 46
47 return em; 47 return em;
48} 48}
@@ -153,10 +153,10 @@ _progress_change_cb(void *data EINA_UNUSED, const Efl_Event *ev)
153} 153}
154 154
155EFL_CALLBACKS_ARRAY_DEFINE(emotion_object_example_callbacks, 155EFL_CALLBACKS_ARRAY_DEFINE(emotion_object_example_callbacks,
156 { EMOTION_OBJECT_EVENT_FRAME_DECODE, _frame_decode_cb }, 156 { EFL_CANVAS_VIDEO_EVENT_FRAME_DECODE, _frame_decode_cb },
157 { EMOTION_OBJECT_EVENT_LENGTH_CHANGE, _length_change_cb }, 157 { EFL_CANVAS_VIDEO_EVENT_LENGTH_CHANGE, _length_change_cb },
158 { EMOTION_OBJECT_EVENT_POSITION_UPDATE, _position_update_cb }, 158 { EFL_CANVAS_VIDEO_EVENT_POSITION_CHANGE, _position_update_cb },
159 { EMOTION_OBJECT_EVENT_PROGRESS_CHANGE, _progress_change_cb }); 159 { EFL_CANVAS_VIDEO_EVENT_PROGRESS_CHANGE, _progress_change_cb });
160 160
161int 161int
162main(int argc, const char *argv[]) 162main(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 b5124c6..de396b3 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[])
78 emotion_object_video_subtitle_file_set(em, subtitle_filename); 78 emotion_object_video_subtitle_file_set(em, subtitle_filename);
79 79
80 efl_event_callback_add 80 efl_event_callback_add
81 (em, EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _playback_started_cb, NULL); 81 (em, EFL_CANVAS_VIDEO_EVENT_PLAYBACK_START, _playback_started_cb, NULL);
82 82
83 emotion_object_file_set(em, filename); 83 emotion_object_file_set(em, filename);
84 84
diff --git a/src/examples/emotion/emotion_signals_example.c b/src/examples/emotion/emotion_signals_example.c
index 76d6800..5864802 100644
--- a/src/examples/emotion/emotion_signals_example.c
+++ b/src/examples/emotion/emotion_signals_example.c
@@ -58,7 +58,7 @@ static void
58_position_update_cb(void *data EINA_UNUSED, const Efl_Event *ev) 58_position_update_cb(void *data EINA_UNUSED, const Efl_Event *ev)
59{ 59{
60 printf(">>> Emotion object first position update.\n"); 60 printf(">>> Emotion object first position update.\n");
61 efl_event_callback_del(ev->object, EMOTION_OBJECT_EVENT_POSITION_UPDATE, _position_update_cb, NULL); 61 efl_event_callback_del(ev->object, EFL_CANVAS_VIDEO_EVENT_POSITION_CHANGE, _position_update_cb, NULL);
62 _display_info(ev->object); 62 _display_info(ev->object);
63} 63}
64 64
@@ -66,7 +66,7 @@ static void
66_frame_decode_cb(void *data EINA_UNUSED, const Efl_Event *ev) 66_frame_decode_cb(void *data EINA_UNUSED, const Efl_Event *ev)
67{ 67{
68 printf(">>> Emotion object first frame decode.\n"); 68 printf(">>> Emotion object first frame decode.\n");
69 efl_event_callback_del(ev->object, EMOTION_OBJECT_EVENT_FRAME_DECODE, _frame_decode_cb, NULL); 69 efl_event_callback_del(ev->object, EFL_CANVAS_VIDEO_EVENT_FRAME_DECODE, _frame_decode_cb, NULL);
70 _display_info(ev->object); 70 _display_info(ev->object);
71} 71}
72 72
@@ -85,13 +85,13 @@ _frame_resize_cb(void *data EINA_UNUSED, const Efl_Event *ev)
85} 85}
86 86
87EFL_CALLBACKS_ARRAY_DEFINE(emotion_object_example_callbacks, 87EFL_CALLBACKS_ARRAY_DEFINE(emotion_object_example_callbacks,
88 { EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _playback_started_cb }, 88 { EFL_CANVAS_VIDEO_EVENT_PLAYBACK_START, _playback_started_cb },
89 { EMOTION_OBJECT_EVENT_PLAYBACK_FINISHED, _playback_finished_cb }, 89 { EFL_CANVAS_VIDEO_EVENT_PLAYBACK_STOP, _playback_finished_cb },
90 { EMOTION_OBJECT_EVENT_OPEN_DONE, _open_done_cb }, 90 { EFL_CANVAS_VIDEO_EVENT_OPEN_DONE, _open_done_cb },
91 { EMOTION_OBJECT_EVENT_POSITION_UPDATE, _position_update_cb }, 91 { EFL_CANVAS_VIDEO_EVENT_POSITION_CHANGE, _position_update_cb },
92 { EMOTION_OBJECT_EVENT_FRAME_DECODE, _frame_decode_cb }, 92 { EFL_CANVAS_VIDEO_EVENT_FRAME_DECODE, _frame_decode_cb },
93 { EMOTION_OBJECT_EVENT_DECODE_STOP, _decode_stop_cb }, 93 { EFL_CANVAS_VIDEO_EVENT_PLAYBACK_STOP, _decode_stop_cb },
94 { EMOTION_OBJECT_EVENT_FRAME_RESIZE, _frame_resize_cb }); 94 { EFL_CANVAS_VIDEO_EVENT_FRAME_RESIZE, _frame_resize_cb });
95 95
96int 96int
97main(int argc, const char *argv[]) 97main(int argc, const char *argv[])