summaryrefslogtreecommitdiff
path: root/src/examples/emotion
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-03-01 18:06:28 +0000
committerTom Hacohen <tom@stosb.com>2016-03-03 09:58:08 +0000
commitf21ade6123b9053fca8d1632644c48525a99d6e0 (patch)
treec5eb0445f471d21365a7a5a7b0ec7d279c11b398 /src/examples/emotion
parent3faf3f3fc68a839f06b311c35ba020cb25e7c9c4 (diff)
Automatic migration to Eo4.
I just ran my script (email to follow) to migrate all of the EFL automatically. This commit is *only* the automatic conversion, so it can be easily reverted and re-run.
Diffstat (limited to 'src/examples/emotion')
-rw-r--r--src/examples/emotion/emotion_basic_example.c4
-rw-r--r--src/examples/emotion/emotion_border_example.c5
-rw-r--r--src/examples/emotion/emotion_generic_example.c10
-rw-r--r--src/examples/emotion/emotion_generic_subtitle_example.c4
-rw-r--r--src/examples/emotion/emotion_signals_example.c10
5 files changed, 15 insertions, 18 deletions
diff --git a/src/examples/emotion/emotion_basic_example.c b/src/examples/emotion/emotion_basic_example.c
index 2e7abea..9675f6b 100644
--- a/src/examples/emotion/emotion_basic_example.c
+++ b/src/examples/emotion/emotion_basic_example.c
@@ -65,8 +65,8 @@ main(int argc, const char *argv[])
65 em = emotion_object_add(e); 65 em = emotion_object_add(e);
66 emotion_object_init(em, NULL); 66 emotion_object_init(em, NULL);
67 67
68 eo_do(em, eo_event_callback_add 68 eo_event_callback_add
69 (EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _playback_started_cb, NULL)); 69 (em, EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _playback_started_cb, NULL);
70 70
71 emotion_object_file_set(em, filename); 71 emotion_object_file_set(em, filename);
72 72
diff --git a/src/examples/emotion/emotion_border_example.c b/src/examples/emotion/emotion_border_example.c
index 22eca25..ea3c07d 100644
--- a/src/examples/emotion/emotion_border_example.c
+++ b/src/examples/emotion/emotion_border_example.c
@@ -33,8 +33,7 @@ _create_emotion_object(Evas *e)
33 33
34 emotion_object_init(em, "gstreamer1"); 34 emotion_object_init(em, "gstreamer1");
35 35
36 eo_do(em, eo_event_callback_add( 36 eo_event_callback_add(em, EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _playback_started_cb, NULL);
37 EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _playback_started_cb, NULL));
38 37
39 return em; 38 return em;
40} 39}
@@ -241,7 +240,7 @@ main(int argc, const char *argv[])
241 240
242 ecore_evas_data_set(ee, "emotion", em); 241 ecore_evas_data_set(ee, "emotion", em);
243 242
244 eo_do(em, eo_event_callback_array_add(emotion_object_example_callbacks, NULL)); 243 eo_event_callback_array_add(em, emotion_object_example_callbacks, NULL);
245 244
246 evas_object_event_callback_add(bg, EVAS_CALLBACK_KEY_DOWN, _on_key_down, em); 245 evas_object_event_callback_add(bg, EVAS_CALLBACK_KEY_DOWN, _on_key_down, em);
247 evas_object_focus_set(bg, EINA_TRUE); 246 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 6ea7dd9..cdbfe6e 100644
--- a/src/examples/emotion/emotion_generic_example.c
+++ b/src/examples/emotion/emotion_generic_example.c
@@ -45,10 +45,10 @@ _create_emotion_object(Evas *e)
45 45
46 emotion_object_init(em, "generic"); 46 emotion_object_init(em, "generic");
47 47
48 eo_do(em, eo_event_callback_add 48 eo_event_callback_add
49 (EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _playback_started_cb, NULL)); 49 (em, EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _playback_started_cb, NULL);
50 eo_do(em, eo_event_callback_add 50 eo_event_callback_add
51 (EMOTION_OBJECT_EVENT_PLAYBACK_FINISHED, _playback_stopped_cb, NULL)); 51 (em, EMOTION_OBJECT_EVENT_PLAYBACK_FINISHED, _playback_stopped_cb, NULL);
52 52
53 return em; 53 return em;
54} 54}
@@ -227,7 +227,7 @@ main(int argc, const char *argv[])
227 evas_object_resize(em, WIDTH, HEIGHT); 227 evas_object_resize(em, WIDTH, HEIGHT);
228 evas_object_show(em); 228 evas_object_show(em);
229 229
230 eo_do(em, eo_event_callback_array_add(emotion_object_example_callbacks, NULL)); 230 eo_event_callback_array_add(em, emotion_object_example_callbacks, NULL);
231 231
232 evas_object_event_callback_add(bg, EVAS_CALLBACK_KEY_DOWN, _on_key_down, em); 232 evas_object_event_callback_add(bg, EVAS_CALLBACK_KEY_DOWN, _on_key_down, em);
233 evas_object_focus_set(bg, EINA_TRUE); 233 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 03b8aab..1d32f77 100644
--- a/src/examples/emotion/emotion_generic_subtitle_example.c
+++ b/src/examples/emotion/emotion_generic_subtitle_example.c
@@ -80,8 +80,8 @@ main(int argc, const char *argv[])
80 if (subtitle_filename) 80 if (subtitle_filename)
81 emotion_object_video_subtitle_file_set(em, subtitle_filename); 81 emotion_object_video_subtitle_file_set(em, subtitle_filename);
82 82
83 eo_do(em, eo_event_callback_add 83 eo_event_callback_add
84 (EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _playback_started_cb, NULL)); 84 (em, EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _playback_started_cb, NULL);
85 85
86 emotion_object_file_set(em, filename); 86 emotion_object_file_set(em, filename);
87 87
diff --git a/src/examples/emotion/emotion_signals_example.c b/src/examples/emotion/emotion_signals_example.c
index 3c56c40..b84c47d 100644
--- a/src/examples/emotion/emotion_signals_example.c
+++ b/src/examples/emotion/emotion_signals_example.c
@@ -68,8 +68,7 @@ _position_update_cb(void *data EINA_UNUSED,
68 Eo *o, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) 68 Eo *o, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
69{ 69{
70 printf(">>> Emotion object first position update.\n"); 70 printf(">>> Emotion object first position update.\n");
71 eo_do(o, eo_event_callback_del(EMOTION_OBJECT_EVENT_POSITION_UPDATE, 71 eo_event_callback_del(o, EMOTION_OBJECT_EVENT_POSITION_UPDATE, _position_update_cb, NULL);
72 _position_update_cb, NULL));
73 _display_info(o); 72 _display_info(o);
74 73
75 return EINA_TRUE; 74 return EINA_TRUE;
@@ -80,8 +79,7 @@ _frame_decode_cb(void *data EINA_UNUSED,
80 Eo *o, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) 79 Eo *o, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
81{ 80{
82 printf(">>> Emotion object first frame decode.\n"); 81 printf(">>> Emotion object first frame decode.\n");
83 eo_do(o, eo_event_callback_del(EMOTION_OBJECT_EVENT_FRAME_DECODE, 82 eo_event_callback_del(o, EMOTION_OBJECT_EVENT_FRAME_DECODE, _frame_decode_cb, NULL);
84 _frame_decode_cb, NULL));
85 _display_info(o); 83 _display_info(o);
86 84
87 return EINA_TRUE; 85 return EINA_TRUE;
@@ -121,8 +119,8 @@ static const Eo_Callback_Array_Item emotion_object_example_callbacks[] = {
121static void 119static void
122_setup_emotion_callbacks(Evas_Object *o) 120_setup_emotion_callbacks(Evas_Object *o)
123{ 121{
124 eo_do(o, eo_event_callback_add 122 eo_event_callback_add
125 (EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _playback_started_cb, NULL)); 123 (o, EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, _playback_started_cb, NULL);
126} 124}
127 125
128int 126int