summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2014-04-03 12:27:57 +0100
committerTom Hacohen <tom@stosb.com>2014-04-03 12:27:57 +0100
commitea387769f59583d6da2fb2247f1aacc9f0e6c12f (patch)
tree29e748e0967335afb33c8065054ab202492add47
parent4e5cac21bf558802fe28310e62cd50e0977bbf6e (diff)
Adjusted code to use the Eo2 API.
-rw-r--r--src/bin/image_data_argb.c4
-rw-r--r--src/bin/image_data_argb_alpha.c4
-rw-r--r--src/bin/main.c4
-rw-r--r--src/bin/proxy_image.c2
-rw-r--r--src/bin/proxy_text_fixed.c2
-rw-r--r--src/bin/proxy_text_random.c2
-rw-r--r--src/bin/textblock_text_append.c4
-rw-r--r--src/bin/ui.c16
8 files changed, 14 insertions, 24 deletions
diff --git a/src/bin/image_data_argb.c b/src/bin/image_data_argb.c
index 0ec50ca..6a9e9c2 100644
--- a/src/bin/image_data_argb.c
+++ b/src/bin/image_data_argb.c
@@ -62,8 +62,8 @@ static void _loop(double t, int f)
62 eo_do(o_images[i], evas_obj_position_set(x, y), 62 eo_do(o_images[i], evas_obj_position_set(x, y),
63 evas_obj_size_set(w, h), 63 evas_obj_size_set(w, h),
64 evas_obj_image_fill_set(0, 0, w, h), 64 evas_obj_image_fill_set(0, 0, w, h),
65 evas_obj_image_data_get(1, (void **) &data), 65 data = evas_obj_image_data_get(1),
66 evas_obj_image_stride_get(&st)); 66 st = evas_obj_image_stride_get());
67 st = st >> 2; 67 st = st >> 2;
68 p = data; 68 p = data;
69 for (y = 0; y < h; y++) 69 for (y = 0; y < h; y++)
diff --git a/src/bin/image_data_argb_alpha.c b/src/bin/image_data_argb_alpha.c
index 39211a7..1a1087a 100644
--- a/src/bin/image_data_argb_alpha.c
+++ b/src/bin/image_data_argb_alpha.c
@@ -62,8 +62,8 @@ static void _loop(double t, int f)
62 eo_do(o_images[i], evas_obj_position_set(x, y), 62 eo_do(o_images[i], evas_obj_position_set(x, y),
63 evas_obj_size_set(w, h), 63 evas_obj_size_set(w, h),
64 evas_obj_image_fill_set(0, 0, w, h), 64 evas_obj_image_fill_set(0, 0, w, h),
65 evas_obj_image_data_get(1, (void **) &data), 65 data = evas_obj_image_data_get(1),
66 evas_obj_image_stride_get(&st)); 66 st = evas_obj_image_stride_get());
67 st = st >> 2; 67 st = st >> 2;
68 p = data; 68 p = data;
69 for (y = 0; y < h; y++) 69 for (y = 0; y < h; y++)
diff --git a/src/bin/main.c b/src/bin/main.c
index 432cceb..cbfc203 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -1390,12 +1390,10 @@ main(int argc, char **argv)
1390 ui_loop(); 1390 ui_loop();
1391 if (async_render) 1391 if (async_render)
1392 { 1392 {
1393 Eina_Bool ret = EINA_FALSE;
1394
1395 if (evas) 1393 if (evas)
1396 eo_do(evas, 1394 eo_do(evas,
1397 evas_canvas_sync(), 1395 evas_canvas_sync(),
1398 evas_canvas_render_async(&ret)); 1396 evas_canvas_render_async());
1399 } 1397 }
1400 else 1398 else
1401 { 1399 {
diff --git a/src/bin/proxy_image.c b/src/bin/proxy_image.c
index 72a8af3..d539255 100644
--- a/src/bin/proxy_image.c
+++ b/src/bin/proxy_image.c
@@ -36,7 +36,7 @@ static void _setup(void)
36 o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas); 36 o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
37 o_images[i] = o; 37 o_images[i] = o;
38 if (o) 38 if (o)
39 eo_do(o, evas_obj_image_source_set(src, NULL), 39 eo_do(o, evas_obj_image_source_set(src),
40 evas_obj_size_set(120, 160), 40 evas_obj_size_set(120, 160),
41 evas_obj_image_fill_set(0,0,120,160), 41 evas_obj_image_fill_set(0,0,120,160),
42 evas_obj_visibility_set(EINA_TRUE)); 42 evas_obj_visibility_set(EINA_TRUE));
diff --git a/src/bin/proxy_text_fixed.c b/src/bin/proxy_text_fixed.c
index 15fef33..3b8d8c8 100644
--- a/src/bin/proxy_text_fixed.c
+++ b/src/bin/proxy_text_fixed.c
@@ -49,7 +49,7 @@ static void _setup(void)
49 o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas); 49 o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
50 o_texts[i] = o; 50 o_texts[i] = o;
51 if (o) 51 if (o)
52 eo_do(o, evas_obj_image_source_set(s, NULL)); 52 eo_do(o, evas_obj_image_source_set(s));
53 /* FIXME s == NULL*/ 53 /* FIXME s == NULL*/
54 if (s) 54 if (s)
55 eo_do(s, evas_obj_size_get(&w, &h)); 55 eo_do(s, evas_obj_size_get(&w, &h));
diff --git a/src/bin/proxy_text_random.c b/src/bin/proxy_text_random.c
index 5b7790b..812ba2f 100644
--- a/src/bin/proxy_text_random.c
+++ b/src/bin/proxy_text_random.c
@@ -58,7 +58,7 @@ static void _setup(void)
58 o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas); 58 o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
59 o_texts[i] = o; 59 o_texts[i] = o;
60 if (o) 60 if (o)
61 eo_do(o, evas_obj_image_source_set(o_texts[0], NULL)); 61 eo_do(o, evas_obj_image_source_set(o_texts[0]));
62 if (o_texts[0]) 62 if (o_texts[0])
63 eo_do(o_texts[0], evas_obj_size_get(&w, &h)); 63 eo_do(o_texts[0], evas_obj_size_get(&w, &h));
64 if (o) 64 if (o)
diff --git a/src/bin/textblock_text_append.c b/src/bin/textblock_text_append.c
index 00c4c6b..54a70c8 100644
--- a/src/bin/textblock_text_append.c
+++ b/src/bin/textblock_text_append.c
@@ -117,7 +117,7 @@ static void _loop(double t, int f)
117 Evas_Textblock_Cursor *cur; 117 Evas_Textblock_Cursor *cur;
118 static Evas_Textblock_Cursor *cur2; 118 static Evas_Textblock_Cursor *cur2;
119 if (o_text) 119 if (o_text)
120 eo_do(o_text, evas_obj_textblock_cursor_get(&cur)); 120 eo_do(o_text, cur = evas_obj_textblock_cursor_get());
121 evas_textblock_cursor_text_append(cur, "*"); 121 evas_textblock_cursor_text_append(cur, "*");
122 evas_textblock_cursor_char_delete(cur); 122 evas_textblock_cursor_char_delete(cur);
123 123
@@ -125,7 +125,7 @@ static void _loop(double t, int f)
125 if (!cur2) 125 if (!cur2)
126 { 126 {
127 if (o_text) 127 if (o_text)
128 eo_do(o_text, evas_obj_textblock_cursor_new(&cur2)); 128 eo_do(o_text, cur2 = evas_obj_textblock_cursor_new());
129 evas_textblock_cursor_paragraph_last(cur2); 129 evas_textblock_cursor_paragraph_last(cur2);
130 evas_textblock_cursor_paragraph_char_first(cur2); 130 evas_textblock_cursor_paragraph_char_first(cur2);
131 } 131 }
diff --git a/src/bin/ui.c b/src/bin/ui.c
index 68c025a..b5a28a4 100644
--- a/src/bin/ui.c
+++ b/src/bin/ui.c
@@ -276,12 +276,10 @@ _ui_all(void)
276 ui_loop(); 276 ui_loop();
277 if (async_render) 277 if (async_render)
278 { 278 {
279 Eina_Bool ret = EINA_FALSE;
280
281 if (evas) 279 if (evas)
282 eo_do(evas, 280 eo_do(evas,
283 evas_canvas_sync(), 281 evas_canvas_sync(),
284 evas_canvas_render_async(&ret)); 282 evas_canvas_render_async());
285 } 283 }
286 else 284 else
287 { 285 {
@@ -293,12 +291,10 @@ _ui_all(void)
293 counted at all. */ 291 counted at all. */
294 if (async_render) 292 if (async_render)
295 { 293 {
296 Eina_Bool ret = EINA_FALSE;
297
298 if (evas) 294 if (evas)
299 eo_do(evas, 295 eo_do(evas,
300 evas_canvas_sync(), 296 evas_canvas_sync(),
301 evas_canvas_render_async(&ret)); 297 evas_canvas_render_async());
302 } 298 }
303 else 299 else
304 { 300 {
@@ -415,12 +411,10 @@ _ui_num(int n)
415 engine_loop(); 411 engine_loop();
416 if (async_render) 412 if (async_render)
417 { 413 {
418 Eina_Bool ret = EINA_FALSE;
419
420 if (evas) 414 if (evas)
421 eo_do(evas, 415 eo_do(evas,
422 evas_canvas_sync(), 416 evas_canvas_sync(),
423 evas_canvas_render_async(&ret)); 417 evas_canvas_render_async());
424 } 418 }
425 else 419 else
426 { 420 {
@@ -432,12 +426,10 @@ _ui_num(int n)
432 counted at all. */ 426 counted at all. */
433 if (async_render) 427 if (async_render)
434 { 428 {
435 Eina_Bool ret = EINA_FALSE;
436
437 if (evas) 429 if (evas)
438 eo_do(evas, 430 eo_do(evas,
439 evas_canvas_sync(), 431 evas_canvas_sync(),
440 evas_canvas_render_async(&ret)); 432 evas_canvas_render_async());
441 } 433 }
442 else 434 else
443 { 435 {