summaryrefslogtreecommitdiff
path: root/src/examples/emotion
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-08-10 15:23:04 +0100
committerTom Hacohen <tom@stosb.com>2016-08-11 17:04:43 +0100
commitc662934be8bcbaba60d1688e77533acbea5d09b9 (patch)
tree8e12b5ffd083024f09b7ec7fa9f979113056fb9d /src/examples/emotion
parente64e120a51972c44fb8cae88a78bb4aa34f502c7 (diff)
Change the EFL to follow the new Eo rename.
Diffstat (limited to 'src/examples/emotion')
-rw-r--r--src/examples/emotion/emotion_basic_example.c2
-rw-r--r--src/examples/emotion/emotion_border_example.c4
-rw-r--r--src/examples/emotion/emotion_generic_example.c6
-rw-r--r--src/examples/emotion/emotion_generic_subtitle_example.c2
-rw-r--r--src/examples/emotion/emotion_signals_example.c6
5 files changed, 10 insertions, 10 deletions
diff --git a/src/examples/emotion/emotion_basic_example.c b/src/examples/emotion/emotion_basic_example.c
index 7f14486807..5ea23bfa50 100644
--- a/src/examples/emotion/emotion_basic_example.c
+++ b/src/examples/emotion/emotion_basic_example.c
@@ -62,7 +62,7 @@ main(int argc, const char *argv[])
62 em = emotion_object_add(e); 62 em = emotion_object_add(e);
63 emotion_object_init(em, NULL); 63 emotion_object_init(em, NULL);
64 64
65 eo_event_callback_add 65 efl_event_callback_add
66 (em, EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _playback_started_cb, NULL); 66 (em, EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _playback_started_cb, NULL);
67 67
68 emotion_object_file_set(em, filename); 68 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 e106a11c2f..d2328a699e 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 eo_event_callback_add(em, EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _playback_started_cb, NULL); 33 efl_event_callback_add(em, EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _playback_started_cb, NULL);
34 34
35 return em; 35 return em;
36} 36}
@@ -220,7 +220,7 @@ main(int argc, const char *argv[])
220 220
221 ecore_evas_data_set(ee, "emotion", em); 221 ecore_evas_data_set(ee, "emotion", em);
222 222
223 eo_event_callback_array_add(em, emotion_object_example_callbacks(), NULL); 223 efl_event_callback_array_add(em, emotion_object_example_callbacks(), NULL);
224 224
225 evas_object_event_callback_add(bg, EVAS_CALLBACK_KEY_DOWN, _on_key_down, em); 225 evas_object_event_callback_add(bg, EVAS_CALLBACK_KEY_DOWN, _on_key_down, em);
226 evas_object_focus_set(bg, EINA_TRUE); 226 evas_object_focus_set(bg, EINA_TRUE);
diff --git a/src/examples/emotion/emotion_generic_example.c b/src/examples/emotion/emotion_generic_example.c
index f7afebabfe..71c8e7dc06 100644
--- a/src/examples/emotion/emotion_generic_example.c
+++ b/src/examples/emotion/emotion_generic_example.c
@@ -39,9 +39,9 @@ _create_emotion_object(Evas *e)
39 39
40 emotion_object_init(em, "generic"); 40 emotion_object_init(em, "generic");
41 41
42 eo_event_callback_add 42 efl_event_callback_add
43 (em, EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _playback_started_cb, NULL); 43 (em, EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _playback_started_cb, NULL);
44 eo_event_callback_add 44 efl_event_callback_add
45 (em, EMOTION_OBJECT_EVENT_PLAYBACK_FINISHED, _playback_stopped_cb, NULL); 45 (em, EMOTION_OBJECT_EVENT_PLAYBACK_FINISHED, _playback_stopped_cb, NULL);
46 46
47 return em; 47 return em;
@@ -207,7 +207,7 @@ main(int argc, const char *argv[])
207 evas_object_resize(em, WIDTH, HEIGHT); 207 evas_object_resize(em, WIDTH, HEIGHT);
208 evas_object_show(em); 208 evas_object_show(em);
209 209
210 eo_event_callback_array_add(em, emotion_object_example_callbacks(), NULL); 210 efl_event_callback_array_add(em, emotion_object_example_callbacks(), NULL);
211 211
212 evas_object_event_callback_add(bg, EVAS_CALLBACK_KEY_DOWN, _on_key_down, em); 212 evas_object_event_callback_add(bg, EVAS_CALLBACK_KEY_DOWN, _on_key_down, em);
213 evas_object_focus_set(bg, EINA_TRUE); 213 evas_object_focus_set(bg, EINA_TRUE);
diff --git a/src/examples/emotion/emotion_generic_subtitle_example.c b/src/examples/emotion/emotion_generic_subtitle_example.c
index 8bfa151277..275298ba54 100644
--- a/src/examples/emotion/emotion_generic_subtitle_example.c
+++ b/src/examples/emotion/emotion_generic_subtitle_example.c
@@ -77,7 +77,7 @@ main(int argc, const char *argv[])
77 if (subtitle_filename) 77 if (subtitle_filename)
78 emotion_object_video_subtitle_file_set(em, subtitle_filename); 78 emotion_object_video_subtitle_file_set(em, subtitle_filename);
79 79
80 eo_event_callback_add 80 efl_event_callback_add
81 (em, EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _playback_started_cb, NULL); 81 (em, EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _playback_started_cb, NULL);
82 82
83 emotion_object_file_set(em, filename); 83 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 c85f86a4c8..7cf57e3288 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 Eo_Event *ev) 58_position_update_cb(void *data EINA_UNUSED, const Eo_Event *ev)
59{ 59{
60 printf(">>> Emotion object first position update.\n"); 60 printf(">>> Emotion object first position update.\n");
61 eo_event_callback_del(ev->object, EMOTION_OBJECT_EVENT_POSITION_UPDATE, _position_update_cb, NULL); 61 efl_event_callback_del(ev->object, EMOTION_OBJECT_EVENT_POSITION_UPDATE, _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 Eo_Event *ev) 66_frame_decode_cb(void *data EINA_UNUSED, const Eo_Event *ev)
67{ 67{
68 printf(">>> Emotion object first frame decode.\n"); 68 printf(">>> Emotion object first frame decode.\n");
69 eo_event_callback_del(ev->object, EMOTION_OBJECT_EVENT_FRAME_DECODE, _frame_decode_cb, NULL); 69 efl_event_callback_del(ev->object, EMOTION_OBJECT_EVENT_FRAME_DECODE, _frame_decode_cb, NULL);
70 _display_info(ev->object); 70 _display_info(ev->object);
71} 71}
72 72
@@ -144,7 +144,7 @@ main(int argc, const char *argv[])
144 fprintf(stderr, "Emotion: \"%s\" module could not be initialized.\n", module); 144 fprintf(stderr, "Emotion: \"%s\" module could not be initialized.\n", module);
145 145
146 _display_info(em); 146 _display_info(em);
147 eo_event_callback_array_add(em, emotion_object_example_callbacks(), NULL); 147 efl_event_callback_array_add(em, emotion_object_example_callbacks(), NULL);
148 148
149 if (!emotion_object_file_set(em, filename)) 149 if (!emotion_object_file_set(em, filename))
150 fprintf(stderr, "Emotion: Could not load the file \"%s\"\n", filename); 150 fprintf(stderr, "Emotion: Could not load the file \"%s\"\n", filename);