Adjust the code according to the eo event stop changes.

This was changed in the previous commit.
This commit is contained in:
Tom Hacohen 2016-06-20 15:31:31 +01:00
parent 6d2b1fd79b
commit c55d3e28ee
10 changed files with 29 additions and 77 deletions

View File

@ -191,7 +191,7 @@ handle_input(void *data EINA_UNUSED, Ecore_Fd_Handler *handler)
return EINA_TRUE;
}
static Eina_Bool _play_finished(void *data EINA_UNUSED, const Eo_Event *event)
static void _play_finished(void *data EINA_UNUSED, const Eo_Event *event)
{
const char *name;
Eina_Bool ret;

View File

@ -15,7 +15,7 @@
double volume = 1;
Eina_List *inputs = NULL;
static Eina_Bool _play_finished(void *data EINA_UNUSED, const Eo_Event *event)
static void _play_finished(void *data EINA_UNUSED, const Eo_Event *event)
{
const char *name;
Eo *out;

View File

@ -10,7 +10,7 @@
#include <Eio.h>
#include <Ecore.h>
Eina_Bool
void
sentry_cb(void *data EINA_UNUSED, const Eo_Event *event)
{
Eio_Sentry_Event *event_info = event->info;
@ -20,7 +20,7 @@ sentry_cb(void *data EINA_UNUSED, const Eo_Event *event)
ecore_main_loop_quit();
return EINA_FALSE;
eo_event_callback_stop(event->object);
}
void

View File

@ -46,7 +46,7 @@ _filter_cb(void *data EINA_UNUSED, Eio_File *handler EINA_UNUSED, const Eina_Fil
return EINA_FALSE;
}
static Eina_Bool
static void
_list_selected_cb(void *data EINA_UNUSED, const Eo_Event *event)
{
Efl_Model_Test_Filemvc_Data *priv = data;
@ -55,7 +55,6 @@ _list_selected_cb(void *data EINA_UNUSED, const Eo_Event *event)
printf("LIST selected model\n");
elm_view_form_model_set(priv->formview, child);
return EINA_TRUE;
}
static void
@ -75,7 +74,7 @@ _promise_error(void *data, const Eina_Error err)
{
}
static Eina_Bool
static void
_tree_selected_cb(void *data, const Eo_Event *event)
{
Efl_Model_Test_Filemvc_Data *priv = data;
@ -86,7 +85,6 @@ _tree_selected_cb(void *data, const Eo_Event *event)
promise= efl_model_property_get(child, "path");
eina_promise_then(promise, &_promise_then, &_promise_error, priv);
return EINA_TRUE;
}
static void

View File

@ -14,12 +14,10 @@
#define WIDTH (320)
#define HEIGHT (240)
static Eina_Bool
static void
_playback_started_cb(void *data EINA_UNUSED, const Eo_Event *ev EINA_UNUSED)
{
printf("Emotion object started playback.\n");
return EINA_TRUE;
}
int

View File

@ -17,12 +17,10 @@
static Eina_List *filenames = NULL;
static Eina_List *curfile = NULL;
static Eina_Bool
static void
_playback_started_cb(void *data EINA_UNUSED, const Eo_Event *ev EINA_UNUSED)
{
printf("Emotion object started playback.\n");
return EINA_TRUE;
}
static Evas_Object *
@ -107,48 +105,38 @@ _on_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *o EINA_UNUSED, void *
}
}
static Eina_Bool
static void
_frame_decode_cb(void *data EINA_UNUSED, const Eo_Event *ev EINA_UNUSED)
{
// fprintf(stderr, "smartcb: frame_decode\n");
return EINA_TRUE;
}
static Eina_Bool
static void
_length_change_cb(void *data EINA_UNUSED, const Eo_Event *ev)
{
fprintf(stderr, "smartcb: length_change: %0.3f\n", emotion_object_play_length_get(ev->object));
return EINA_TRUE;
}
static Eina_Bool
static void
_position_update_cb(void *data EINA_UNUSED, const Eo_Event *ev)
{
fprintf(stderr, "smartcb: position_update: %0.3f\n", emotion_object_position_get(ev->object));
return EINA_TRUE;
}
static Eina_Bool
static void
_progress_change_cb(void *data EINA_UNUSED, const Eo_Event *ev)
{
fprintf(stderr, "smartcb: progress_change: %0.3f, %s\n",
emotion_object_progress_status_get(ev->object),
emotion_object_progress_info_get(ev->object));
return EINA_TRUE;
}
static Eina_Bool
static void
_frame_resize_cb(void *data EINA_UNUSED, const Eo_Event *ev)
{
int w, h;
emotion_object_size_get(ev->object, &w, &h);
fprintf(stderr, "smartcb: frame_resize: %dx%d\n", w, h);
return EINA_TRUE;
}
static void /* adjust canvas' contents on resizes */

View File

@ -18,22 +18,18 @@
static Eina_List *filenames = NULL;
static Eina_List *curfile = NULL;
static Eina_Bool
static void
_playback_started_cb(void *data EINA_UNUSED, const Eo_Event *ev EINA_UNUSED)
{
printf("Emotion object started playback.\n");
return EINA_TRUE;
}
static Eina_Bool
static void
_playback_stopped_cb(void *data EINA_UNUSED, const Eo_Event *ev)
{
printf("Emotion playback stopped.\n");
emotion_object_play_set(ev->object, EINA_FALSE);
emotion_object_position_set(ev->object, 0);
return EINA_TRUE;
}
static Evas_Object *
@ -130,38 +126,30 @@ _on_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *o EINA_UNUSED, void *
}
}
static Eina_Bool
static void
_frame_decode_cb(void *data EINA_UNUSED, const Eo_Event *ev EINA_UNUSED)
{
// fprintf(stderr, "smartcb: frame_decode\n");
return EINA_TRUE;
}
static Eina_Bool
static void
_length_change_cb(void *data EINA_UNUSED, const Eo_Event *ev)
{
fprintf(stderr, "smartcb: length_change: %0.3f\n", emotion_object_play_length_get(ev->object));
return EINA_TRUE;
}
static Eina_Bool
static void
_position_update_cb(void *data EINA_UNUSED, const Eo_Event *ev)
{
fprintf(stderr, "smartcb: position_update: %0.3f\n", emotion_object_position_get(ev->object));
return EINA_TRUE;
}
static Eina_Bool
static void
_progress_change_cb(void *data EINA_UNUSED, const Eo_Event *ev)
{
fprintf(stderr, "smartcb: progress_change: %0.3f, %s\n",
emotion_object_progress_status_get(ev->object),
emotion_object_progress_info_get(ev->object));
return EINA_TRUE;
}
EO_CALLBACKS_ARRAY_DEFINE(emotion_object_example_callbacks,

View File

@ -13,12 +13,10 @@
#define WIDTH (320)
#define HEIGHT (240)
static Eina_Bool
static void
_playback_started_cb(void *data EINA_UNUSED, const Eo_Event *ev EINA_UNUSED)
{
printf("Emotion object started playback.\n");
return EINA_TRUE;
}
static void

View File

@ -33,69 +33,55 @@ _display_info(Evas_Object *o)
printf("\n");
}
static Eina_Bool
static void
_playback_started_cb(void *data EINA_UNUSED, const Eo_Event *ev)
{
printf(">>> Emotion object started playback.\n");
_display_info(ev->object);
return EINA_TRUE;
}
static Eina_Bool
static void
_playback_finished_cb(void *data EINA_UNUSED, const Eo_Event *ev)
{
printf(">>> Emotion object finished playback.\n");
_display_info(ev->object);
return EINA_TRUE;
}
static Eina_Bool
static void
_open_done_cb(void *data EINA_UNUSED, const Eo_Event *ev)
{
printf(">>> Emotion object open done.\n");
_display_info(ev->object);
return EINA_TRUE;
}
static Eina_Bool
static void
_position_update_cb(void *data EINA_UNUSED, const Eo_Event *ev)
{
printf(">>> Emotion object first position update.\n");
eo_event_callback_del(ev->object, EMOTION_OBJECT_EVENT_POSITION_UPDATE, _position_update_cb, NULL);
_display_info(ev->object);
return EINA_TRUE;
}
static Eina_Bool
static void
_frame_decode_cb(void *data EINA_UNUSED, const Eo_Event *ev)
{
printf(">>> Emotion object first frame decode.\n");
eo_event_callback_del(ev->object, EMOTION_OBJECT_EVENT_FRAME_DECODE, _frame_decode_cb, NULL);
_display_info(ev->object);
return EINA_TRUE;
}
static Eina_Bool
static void
_decode_stop_cb(void *data EINA_UNUSED, const Eo_Event *ev)
{
printf(">>> Emotion object decode stop.\n");
_display_info(ev->object);
return EINA_TRUE;
}
static Eina_Bool
static void
_frame_resize_cb(void *data EINA_UNUSED, const Eo_Event *ev)
{
printf(">>> Emotion object frame resize.\n");
_display_info(ev->object);
return EINA_TRUE;
}
static void

View File

@ -88,7 +88,7 @@ typedef struct _Scene_Data
Eina_Bool init;
} Scene_Data;
Eina_Bool
void
_cb_clicked(void *data EINA_UNUSED, const Eo_Event *event)
{
Eina_List *meshes = NULL, *l;
@ -112,11 +112,9 @@ _cb_clicked(void *data EINA_UNUSED, const Eo_Event *event)
}
choosed_node = (Evas_Canvas3D_Node *)event->info;
}
return EINA_TRUE;
}
Eina_Bool
void
_cb_collision(void *data EINA_UNUSED, const Eo_Event *event)
{
Eina_List *meshes = NULL, *l;
@ -126,8 +124,6 @@ _cb_collision(void *data EINA_UNUSED, const Eo_Event *event)
{
evas_canvas3d_mesh_shader_mode_set(m, EVAS_CANVAS3D_SHADER_MODE_DIFFUSE);
}
return EINA_TRUE;
}
static void