summaryrefslogtreecommitdiff
path: root/src/examples/emotion
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-06-20 15:31:31 +0100
committerTom Hacohen <tom@stosb.com>2016-06-20 18:02:00 +0100
commit6202cc7485a54dea6f02a2668e7c907247902dd1 (patch)
tree7a1fa2b61175b1ef75a9bff7299a0ce3daa45216 /src/examples/emotion
parentd648eb5311585f7392d0290640ba133814b52589 (diff)
downloadefl-6202cc7485a54dea6f02a2668e7c907247902dd1.tar.gz
Adjust the code according to the eo event stop changes.
This was changed in the previous commit.
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.c24
-rw-r--r--src/examples/emotion/emotion_generic_example.c24
-rw-r--r--src/examples/emotion/emotion_generic_subtitle_example.c4
-rw-r--r--src/examples/emotion/emotion_signals_example.c28
5 files changed, 21 insertions, 63 deletions
diff --git a/src/examples/emotion/emotion_basic_example.c b/src/examples/emotion/emotion_basic_example.c
index 7b6ce436a1..7f14486807 100644
--- a/src/examples/emotion/emotion_basic_example.c
+++ b/src/examples/emotion/emotion_basic_example.c
@@ -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
diff --git a/src/examples/emotion/emotion_border_example.c b/src/examples/emotion/emotion_border_example.c
index 67c43a9efd..e106a11c2f 100644
--- a/src/examples/emotion/emotion_border_example.c
+++ b/src/examples/emotion/emotion_border_example.c
@@ -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 */
diff --git a/src/examples/emotion/emotion_generic_example.c b/src/examples/emotion/emotion_generic_example.c
index f0d7fabd3c..f7afebabfe 100644
--- a/src/examples/emotion/emotion_generic_example.c
+++ b/src/examples/emotion/emotion_generic_example.c
@@ -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,
diff --git a/src/examples/emotion/emotion_generic_subtitle_example.c b/src/examples/emotion/emotion_generic_subtitle_example.c
index 524691651d..8bfa151277 100644
--- a/src/examples/emotion/emotion_generic_subtitle_example.c
+++ b/src/examples/emotion/emotion_generic_subtitle_example.c
@@ -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
diff --git a/src/examples/emotion/emotion_signals_example.c b/src/examples/emotion/emotion_signals_example.c
index ecf30a7cc8..aae1063ef9 100644
--- a/src/examples/emotion/emotion_signals_example.c
+++ b/src/examples/emotion/emotion_signals_example.c
@@ -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