From 6092846d1687e5680d572ba41a7c4495591ce7aa Mon Sep 17 00:00:00 2001 From: Daniel Willmann Date: Wed, 24 Jul 2013 08:52:44 +0200 Subject: [PATCH] ecore examples: Use old API as long as Eo is in flux This avoids build errors while Eo/Eo2 is being moved around. --- src/examples/ecore/ecore_idler_example.c | 6 ++-- src/examples/ecore/ecore_poller_example.c | 36 +++++++++++------------ 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/examples/ecore/ecore_idler_example.c b/src/examples/ecore/ecore_idler_example.c index faef3a515a..6b640863aa 100644 --- a/src/examples/ecore/ecore_idler_example.c +++ b/src/examples/ecore/ecore_idler_example.c @@ -2,7 +2,7 @@ // gcc -o ecore_idler_example ecore_idler_example.c `pkg-config --libs --cflags ecore eo` #include -#include +//#include #include struct context // helper struct to give some context to the callbacks @@ -106,8 +106,8 @@ main(int argc, char **argv) ctxt.enterer = ecore_idle_enterer_add(_enterer_cb, &ctxt); ctxt.exiter = ecore_idle_exiter_add(_exiter_cb, &ctxt); -// ctxt.idler = ecore_idler_add(_idler_cb, &ctxt); - ctxt.idler = eo_add_custom(ECORE_IDLER_CLASS, NULL, ecore_idler_constructor(_idler_cb, &ctxt)); + ctxt.idler = ecore_idler_add(_idler_cb, &ctxt); +// ctxt.idler = eo_add_custom(ECORE_IDLER_CLASS, NULL, ecore_idler_constructor(_idler_cb, &ctxt)); ctxt.handler = ecore_event_handler_add(_event_type, _event_handler_cb, &ctxt); diff --git a/src/examples/ecore/ecore_poller_example.c b/src/examples/ecore/ecore_poller_example.c index 1f76465712..132cb06f41 100644 --- a/src/examples/ecore/ecore_poller_example.c +++ b/src/examples/ecore/ecore_poller_example.c @@ -2,7 +2,7 @@ // gcc -o ecore_poller_example ecore_poller_example.c `pkg-config --libs --cflags ecore eo` #include -#include +//#include #include static double _initial_time = 0; @@ -44,32 +44,32 @@ main(int argc, char **argv) ecore_poller_poll_interval_set(ECORE_POLLER_CORE, interval); -// poller1 = ecore_poller_add(ECORE_POLLER_CORE, 4, _poller_print_cb, str1); -// poller2 = ecore_poller_add(ECORE_POLLER_CORE, 8, _poller_print_cb, str2); - // poller3 = ecore_poller_add(ECORE_POLLER_CORE, 30, _poller_quit_cb, str3); + poller1 = ecore_poller_add(ECORE_POLLER_CORE, 4, _poller_print_cb, str1); + poller2 = ecore_poller_add(ECORE_POLLER_CORE, 8, _poller_print_cb, str2); + poller3 = ecore_poller_add(ECORE_POLLER_CORE, 30, _poller_quit_cb, str3); - poller1 = eo_add_custom(ECORE_POLLER_CLASS, NULL, - ecore_poller_constructor(ECORE_POLLER_CORE, 4, _poller_print_cb, str1)); - poller2 = eo_add_custom(ECORE_POLLER_CLASS, NULL, - ecore_poller_constructor(ECORE_POLLER_CORE, 8, _poller_print_cb, str2)); - poller3 = eo_add_custom(ECORE_POLLER_CLASS, NULL, - ecore_poller_constructor(ECORE_POLLER_CORE, 20, _poller_quit_cb, str3)); +// poller1 = eo_add_custom(ECORE_POLLER_CLASS, NULL, +// ecore_poller_constructor(ECORE_POLLER_CORE, 4, _poller_print_cb, str1)); +// poller2 = eo_add_custom(ECORE_POLLER_CLASS, NULL, +// ecore_poller_constructor(ECORE_POLLER_CORE, 8, _poller_print_cb, str2)); +// poller3 = eo_add_custom(ECORE_POLLER_CLASS, NULL, +// ecore_poller_constructor(ECORE_POLLER_CORE, 20, _poller_quit_cb, str3)); ecore_main_loop_begin(); printf("changing poller2 interval to 16\n"); -// ecore_poller_poller_interval_set(poller2, 16); - eo_do(poller2, ecore_poller_interval_set(16, NULL)); + ecore_poller_poller_interval_set(poller2, 16); +// eo_do(poller2, ecore_poller_interval_set(16, NULL)); ecore_main_loop_begin(); - eo_unref(poller1); - eo_unref(poller2); - eo_unref(poller3); -// ecore_poller_del(poller1); -// ecore_poller_del(poller2); -// ecore_poller_del(poller3); +// eo_unref(poller1); +// eo_unref(poller2); +// eo_unref(poller3); + ecore_poller_del(poller1); + ecore_poller_del(poller2); + ecore_poller_del(poller3); ecore_shutdown(); }