Adapt to latest event names
This commit is contained in:
parent
aad5b641c8
commit
679c89d98d
|
@ -67,7 +67,7 @@ life_board_run(Efl_Ui_Win *win)
|
|||
_life_timer = efl_add(EFL_LOOP_TIMER_CLASS, efl_main_loop_get(),
|
||||
efl_loop_timer_interval_set(efl_added, 0.1));
|
||||
|
||||
efl_event_callback_add(_life_timer, EFL_LOOP_TIMER_EVENT_TICK, _life_tick, win);
|
||||
efl_event_callback_add(_life_timer, EFL_LOOP_TIMER_EVENT_TIMER_TICK, _life_tick, win);
|
||||
}
|
||||
|
||||
int
|
||||
|
|
|
@ -69,7 +69,7 @@ _events_freeze(Efl_Loop *mainloop)
|
|||
efl_add(EFL_LOOP_TIMER_CLASS, mainloop,
|
||||
efl_name_set(efl_added, "timer2"),
|
||||
efl_loop_timer_interval_set(efl_added, .1),
|
||||
efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TICK, _freezethaw_cb, mainloop));
|
||||
efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TIMER_TICK, _freezethaw_cb, mainloop));
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -90,7 +90,7 @@ _timer_cb(void *data EINA_UNUSED, const Efl_Event *event)
|
|||
}
|
||||
|
||||
EFL_CALLBACKS_ARRAY_DEFINE(_callback_array,
|
||||
{ EFL_LOOP_TIMER_EVENT_TICK, _timer_cb },
|
||||
{ EFL_LOOP_TIMER_EVENT_TIMER_TICK, _timer_cb },
|
||||
{ EFL_EVENT_DEL, _del_obj_cb })
|
||||
|
||||
static void
|
||||
|
|
|
@ -60,7 +60,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
|
|||
|
||||
efl_add(EFL_LOOP_TIMER_CLASS, loop,
|
||||
efl_loop_timer_interval_set(efl_added, 0.0005),
|
||||
efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TICK, _timer_cb, NULL));
|
||||
efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TIMER_TICK, _timer_cb, NULL));
|
||||
}
|
||||
EFL_MAIN()
|
||||
|
||||
|
|
|
@ -64,7 +64,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
|
|||
|
||||
efl_add(EFL_LOOP_TIMER_CLASS, loop,
|
||||
efl_loop_timer_interval_set(efl_added, 30),
|
||||
efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TICK, _timer_cb, NULL));
|
||||
efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TIMER_TICK, _timer_cb, NULL));
|
||||
}
|
||||
EFL_MAIN()
|
||||
|
||||
|
|
|
@ -103,7 +103,7 @@ _test1_simple_future(Efl_Loop *loop)
|
|||
// simulate a delayed promise resolve.
|
||||
efl_add(EFL_LOOP_TIMER_CLASS, loop,
|
||||
efl_loop_timer_interval_set(efl_added, 1),
|
||||
efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TICK,
|
||||
efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TIMER_TICK,
|
||||
_test1_resolve, promise));
|
||||
}
|
||||
|
||||
|
@ -154,7 +154,7 @@ _test2_failed_future(Efl_Loop *loop)
|
|||
// simulate a delayed promise rejection.
|
||||
efl_add(EFL_LOOP_TIMER_CLASS, loop,
|
||||
efl_loop_timer_interval_set(efl_added, 1),
|
||||
efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TICK,
|
||||
efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TIMER_TICK,
|
||||
_test2_reject, promise));
|
||||
}
|
||||
|
||||
|
@ -278,7 +278,7 @@ _test4_chained_future(Efl_Loop *loop)
|
|||
// simulate a delayed promise resolve.
|
||||
efl_add(EFL_LOOP_TIMER_CLASS, loop,
|
||||
efl_loop_timer_interval_set(efl_added, 1),
|
||||
efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TICK,
|
||||
efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TIMER_TICK,
|
||||
_test4_resolve, promise));
|
||||
}
|
||||
|
||||
|
|
|
@ -197,7 +197,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev)
|
|||
/* The TCP client to use to send/receive network data */
|
||||
_dialer = efl_add(EFL_NET_DIALER_TCP_CLASS, loop,
|
||||
efl_name_set(efl_added, "dialer"),
|
||||
efl_event_callback_add(efl_added, EFL_NET_DIALER_EVENT_CONNECTED, _dialer_connected, NULL));
|
||||
efl_event_callback_add(efl_added, EFL_NET_DIALER_EVENT_DIALER_CONNECTED, _dialer_connected, NULL));
|
||||
if (!_dialer)
|
||||
{
|
||||
fprintf(stderr, "ERROR: could not create Efl_Net_Dialer_Tcp\n");
|
||||
|
|
|
@ -138,7 +138,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev)
|
|||
/* The TCP client to use to send/receive network data */
|
||||
_dialer = efl_add(EFL_NET_DIALER_TCP_CLASS, loop,
|
||||
efl_name_set(efl_added, "dialer"),
|
||||
efl_event_callback_add(efl_added, EFL_NET_DIALER_EVENT_CONNECTED, _dialer_connected, NULL));
|
||||
efl_event_callback_add(efl_added, EFL_NET_DIALER_EVENT_DIALER_CONNECTED, _dialer_connected, NULL));
|
||||
if (!_dialer)
|
||||
{
|
||||
fprintf(stderr, "ERROR: could not create Efl_Net_Dialer_Tcp\n");
|
||||
|
|
|
@ -134,7 +134,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev)
|
|||
// Wait for 10 seconds before exiting this example
|
||||
efl_add(EFL_LOOP_TIMER_CLASS, loop,
|
||||
efl_loop_timer_interval_set(efl_added, 10.0),
|
||||
efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TICK,
|
||||
efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TIMER_TICK,
|
||||
_quit_cb, NULL));
|
||||
}
|
||||
EFL_MAIN()
|
||||
|
|
|
@ -61,7 +61,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev)
|
|||
// The timer function will trigger the chain of simulated events to show
|
||||
// how an app could respond to system lifecycle events.
|
||||
efl_add(EFL_LOOP_TIMER_CLASS, ev->object,
|
||||
efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TICK, _lifecycle_simulation, ev->object),
|
||||
efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TIMER_TICK, _lifecycle_simulation, ev->object),
|
||||
efl_loop_timer_interval_set(efl_added, 1.0));
|
||||
}
|
||||
EFL_MAIN_EX()
|
||||
|
|
|
@ -235,7 +235,7 @@ efl_main(void *data EINA_UNUSED,
|
|||
/* The TCP client to use to send/receive network data */
|
||||
dialer = efl_add(EFL_NET_DIALER_TCP_CLASS, ev->object,
|
||||
efl_name_set(efl_added, "dialer"),
|
||||
efl_event_callback_add(efl_added, EFL_NET_DIALER_EVENT_CONNECTED, _dialer_connected, NULL));
|
||||
efl_event_callback_add(efl_added, EFL_NET_DIALER_EVENT_DIALER_CONNECTED, _dialer_connected, NULL));
|
||||
if (!dialer)
|
||||
{
|
||||
fprintf(stderr, "ERROR: could not create Efl_Net_Dialer_Tcp\n");
|
||||
|
|
|
@ -78,7 +78,7 @@ _dialer_connected(void *data EINA_UNUSED, const Efl_Event *event)
|
|||
EFL_CALLBACKS_ARRAY_DEFINE(dialer_cbs,
|
||||
{ EFL_NET_DIALER_EVENT_RESOLVED, _dialer_resolved },
|
||||
{ EFL_NET_DIALER_EVENT_ERROR, _dialer_error },
|
||||
{ EFL_NET_DIALER_EVENT_CONNECTED, _dialer_connected });
|
||||
{ EFL_NET_DIALER_EVENT_DIALER_CONNECTED, _dialer_connected });
|
||||
|
||||
static void
|
||||
_http_headers_done(void *data EINA_UNUSED, const Efl_Event *event)
|
||||
|
|
|
@ -304,7 +304,7 @@ efl_main(void *data EINA_UNUSED,
|
|||
/* The TCP client to use to send/receive network data */
|
||||
dialer = efl_add(EFL_NET_DIALER_TCP_CLASS, loop,
|
||||
efl_name_set(efl_added, "dialer"),
|
||||
efl_event_callback_add(efl_added, EFL_NET_DIALER_EVENT_CONNECTED, _dialer_connected, NULL));
|
||||
efl_event_callback_add(efl_added, EFL_NET_DIALER_EVENT_DIALER_CONNECTED, _dialer_connected, NULL));
|
||||
if (!dialer)
|
||||
{
|
||||
fprintf(stderr, "ERROR: could not create Efl_Net_Dialer_Tcp\n");
|
||||
|
|
|
@ -70,7 +70,7 @@ _http_headers_done(void *data EINA_UNUSED, const Efl_Event *event)
|
|||
|
||||
EFL_CALLBACKS_ARRAY_DEFINE(dialer_cbs,
|
||||
{ EFL_NET_DIALER_HTTP_EVENT_HEADERS_DONE, _http_headers_done },
|
||||
{ EFL_NET_DIALER_EVENT_CONNECTED, _connected },
|
||||
{ EFL_NET_DIALER_EVENT_DIALER_CONNECTED, _connected },
|
||||
{ EFL_NET_DIALER_EVENT_RESOLVED, _resolved },
|
||||
{ EFL_NET_DIALER_EVENT_ERROR, _error },
|
||||
{ EFL_IO_CLOSER_EVENT_CLOSED, _closed },
|
||||
|
|
|
@ -175,7 +175,7 @@ _done(void *data EINA_UNUSED, const Efl_Event *event)
|
|||
}
|
||||
|
||||
EFL_CALLBACKS_ARRAY_DEFINE(dialer_cbs,
|
||||
{ EFL_NET_DIALER_EVENT_CONNECTED, _connected }, /* optional */
|
||||
{ EFL_NET_DIALER_EVENT_DIALER_CONNECTED, _connected }, /* optional */
|
||||
{ EFL_NET_DIALER_EVENT_RESOLVED, _resolved }, /* optional */
|
||||
{ EFL_IO_READER_EVENT_CAN_READ_CHANGED, _can_read }, /* optional, can be used to read data, here just for monitoring */
|
||||
{ EFL_IO_READER_EVENT_EOS, _eos }, /* recommended, notifies no more incoming data */
|
||||
|
|
|
@ -155,7 +155,7 @@ _error(void *data EINA_UNUSED, const Efl_Event *event)
|
|||
}
|
||||
|
||||
EFL_CALLBACKS_ARRAY_DEFINE(dialer_cbs,
|
||||
{ EFL_NET_DIALER_EVENT_CONNECTED, _connected },
|
||||
{ EFL_NET_DIALER_EVENT_DIALER_CONNECTED, _connected },
|
||||
{ EFL_NET_DIALER_EVENT_RESOLVED, _resolved },
|
||||
{ EFL_NET_DIALER_EVENT_ERROR, _error },
|
||||
{ EFL_IO_READER_EVENT_CAN_READ_CHANGED, _can_read },
|
||||
|
|
|
@ -107,7 +107,7 @@ _error(void *data EINA_UNUSED, const Efl_Event *event)
|
|||
}
|
||||
|
||||
EFL_CALLBACKS_ARRAY_DEFINE(dialer_cbs,
|
||||
{ EFL_NET_DIALER_EVENT_CONNECTED, _connected },
|
||||
{ EFL_NET_DIALER_EVENT_DIALER_CONNECTED, _connected },
|
||||
{ EFL_NET_DIALER_EVENT_RESOLVED, _resolved },
|
||||
{ EFL_NET_DIALER_EVENT_ERROR, _error },
|
||||
{ EFL_IO_READER_EVENT_EOS, _eos },
|
||||
|
|
|
@ -246,7 +246,7 @@ EFL_CALLBACKS_ARRAY_DEFINE(dialer_cbs,
|
|||
{ EFL_NET_DIALER_WEBSOCKET_EVENT_CLOSED_REASON, _ws_closed_reason },
|
||||
{ EFL_NET_DIALER_WEBSOCKET_EVENT_MESSAGE_TEXT, _ws_message_text },
|
||||
{ EFL_NET_DIALER_WEBSOCKET_EVENT_MESSAGE_BINARY, _ws_message_binary },
|
||||
{ EFL_NET_DIALER_EVENT_CONNECTED, _connected },
|
||||
{ EFL_NET_DIALER_EVENT_DIALER_CONNECTED, _connected },
|
||||
{ EFL_NET_DIALER_EVENT_ERROR, _error },
|
||||
{ EFL_IO_CLOSER_EVENT_CLOSED, _closed },
|
||||
{ EFL_IO_READER_EVENT_EOS, _eos },
|
||||
|
|
|
@ -144,7 +144,7 @@ EFL_CALLBACKS_ARRAY_DEFINE(dialer_cbs,
|
|||
{ EFL_NET_DIALER_WEBSOCKET_EVENT_CLOSED_REASON, _ws_closed_reason },
|
||||
{ EFL_NET_DIALER_WEBSOCKET_EVENT_MESSAGE_TEXT, _ws_message_text },
|
||||
{ EFL_NET_DIALER_WEBSOCKET_EVENT_MESSAGE_BINARY, _ws_message_binary },
|
||||
{ EFL_NET_DIALER_EVENT_CONNECTED, _connected },
|
||||
{ EFL_NET_DIALER_EVENT_DIALER_CONNECTED, _connected },
|
||||
{ EFL_NET_DIALER_EVENT_RESOLVED, _resolved },
|
||||
{ EFL_NET_DIALER_EVENT_ERROR, _error },
|
||||
{ EFL_IO_CLOSER_EVENT_CLOSED, _closed },
|
||||
|
|
|
@ -106,7 +106,7 @@ _error(void *data EINA_UNUSED, const Efl_Event *event)
|
|||
}
|
||||
|
||||
EFL_CALLBACKS_ARRAY_DEFINE(dialer_cbs,
|
||||
{ EFL_NET_DIALER_EVENT_CONNECTED, _connected },
|
||||
{ EFL_NET_DIALER_EVENT_DIALER_CONNECTED, _connected },
|
||||
{ EFL_NET_DIALER_EVENT_RESOLVED, _resolved },
|
||||
{ EFL_NET_DIALER_EVENT_ERROR, _error },
|
||||
{ EFL_IO_READER_EVENT_EOS, _eos },
|
||||
|
|
|
@ -176,7 +176,7 @@ _error(void *data EINA_UNUSED, const Efl_Event *event)
|
|||
}
|
||||
|
||||
EFL_CALLBACKS_ARRAY_DEFINE(dialer_cbs,
|
||||
{ EFL_NET_DIALER_EVENT_CONNECTED, _connected },
|
||||
{ EFL_NET_DIALER_EVENT_DIALER_CONNECTED, _connected },
|
||||
{ EFL_NET_DIALER_EVENT_RESOLVED, _resolved },
|
||||
{ EFL_NET_DIALER_EVENT_ERROR, _error });
|
||||
|
||||
|
|
Loading…
Reference in New Issue