stefan pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=2009ae225d919f14c1c2f78d3ea5184420894000
commit 2009ae225d919f14c1c2f78d3ea5184420894000
Author: Stefan Schmidt <ste...@osg.samsung.com>
Date: Thu May 19 09:19:06 2016 +0200
examples: emotion: adapt to name change from obj to object
In commit 75a53ece1007d927b8f0b6c5d3f269726afb9108 obj was changed to
object.
As one can claerly see though make examples have not been run to verify this
change. Catch up in examples with this rename.
---
src/examples/emotion/emotion_border_example.c | 10 +++++-----
src/examples/emotion/emotion_generic_example.c | 12 ++++++------
src/examples/emotion/emotion_signals_example.c | 18 +++++++++---------
3 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/src/examples/emotion/emotion_border_example.c
b/src/examples/emotion/emotion_border_example.c
index b345597..aac68fd 100644
--- a/src/examples/emotion/emotion_border_example.c
+++ b/src/examples/emotion/emotion_border_example.c
@@ -118,7 +118,7 @@ _frame_decode_cb(void *data EINA_UNUSED, const Eo_Event *ev
EINA_UNUSED)
static Eina_Bool
_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->obj));
+ fprintf(stderr, "smartcb: length_change: %0.3f\n",
emotion_object_play_length_get(ev->object));
return EINA_TRUE;
}
@@ -126,7 +126,7 @@ _length_change_cb(void *data EINA_UNUSED, const Eo_Event
*ev)
static Eina_Bool
_position_update_cb(void *data EINA_UNUSED, const Eo_Event *ev)
{
- fprintf(stderr, "smartcb: position_update: %0.3f\n",
emotion_object_position_get(ev->obj));
+ fprintf(stderr, "smartcb: position_update: %0.3f\n",
emotion_object_position_get(ev->object));
return EINA_TRUE;
}
@@ -135,8 +135,8 @@ static Eina_Bool
_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->obj),
- emotion_object_progress_info_get(ev->obj));
+ emotion_object_progress_status_get(ev->object),
+ emotion_object_progress_info_get(ev->object));
return EINA_TRUE;
}
@@ -145,7 +145,7 @@ static Eina_Bool
_frame_resize_cb(void *data EINA_UNUSED, const Eo_Event *ev)
{
int w, h;
- emotion_object_size_get(ev->obj, &w, &h);
+ emotion_object_size_get(ev->object, &w, &h);
fprintf(stderr, "smartcb: frame_resize: %dx%d\n", w, h);
return EINA_TRUE;
diff --git a/src/examples/emotion/emotion_generic_example.c
b/src/examples/emotion/emotion_generic_example.c
index c585b20..ec15a61 100644
--- a/src/examples/emotion/emotion_generic_example.c
+++ b/src/examples/emotion/emotion_generic_example.c
@@ -30,8 +30,8 @@ static Eina_Bool
_playback_stopped_cb(void *data EINA_UNUSED, const Eo_Event *ev)
{
printf("Emotion playback stopped.\n");
- emotion_object_play_set(ev->obj, EINA_FALSE);
- emotion_object_position_set(ev->obj, 0);
+ emotion_object_play_set(ev->object, EINA_FALSE);
+ emotion_object_position_set(ev->object, 0);
return EINA_TRUE;
}
@@ -141,7 +141,7 @@ _frame_decode_cb(void *data EINA_UNUSED, const Eo_Event *ev
EINA_UNUSED)
static Eina_Bool
_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->obj));
+ fprintf(stderr, "smartcb: length_change: %0.3f\n",
emotion_object_play_length_get(ev->object));
return EINA_TRUE;
}
@@ -149,7 +149,7 @@ _length_change_cb(void *data EINA_UNUSED, const Eo_Event
*ev)
static Eina_Bool
_position_update_cb(void *data EINA_UNUSED, const Eo_Event *ev)
{
- fprintf(stderr, "smartcb: position_update: %0.3f\n",
emotion_object_position_get(ev->obj));
+ fprintf(stderr, "smartcb: position_update: %0.3f\n",
emotion_object_position_get(ev->object));
return EINA_TRUE;
}
@@ -158,8 +158,8 @@ static Eina_Bool
_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->obj),
- emotion_object_progress_info_get(ev->obj));
+ emotion_object_progress_status_get(ev->object),
+ emotion_object_progress_info_get(ev->object));
return EINA_TRUE;
}
diff --git a/src/examples/emotion/emotion_signals_example.c
b/src/examples/emotion/emotion_signals_example.c
index f8fc49d..1a9dcbd 100644
--- a/src/examples/emotion/emotion_signals_example.c
+++ b/src/examples/emotion/emotion_signals_example.c
@@ -37,7 +37,7 @@ static Eina_Bool
_playback_started_cb(void *data EINA_UNUSED, const Eo_Event *ev)
{
printf(">>> Emotion object started playback.\n");
- _display_info(ev->obj);
+ _display_info(ev->object);
return EINA_TRUE;
}
@@ -46,7 +46,7 @@ static Eina_Bool
_playback_finished_cb(void *data EINA_UNUSED, const Eo_Event *ev)
{
printf(">>> Emotion object finished playback.\n");
- _display_info(ev->obj);
+ _display_info(ev->object);
return EINA_TRUE;
}
@@ -55,7 +55,7 @@ static Eina_Bool
_open_done_cb(void *data EINA_UNUSED, const Eo_Event *ev)
{
printf(">>> Emotion object open done.\n");
- _display_info(ev->obj);
+ _display_info(ev->object);
return EINA_TRUE;
}
@@ -64,8 +64,8 @@ static Eina_Bool
_position_update_cb(void *data EINA_UNUSED, const Eo_Event *ev)
{
printf(">>> Emotion object first position update.\n");
- eo_event_callback_del(ev->obj, EMOTION_OBJECT_EVENT_POSITION_UPDATE,
_position_update_cb, NULL);
- _display_info(ev->obj);
+ eo_event_callback_del(ev->object, EMOTION_OBJECT_EVENT_POSITION_UPDATE,
_position_update_cb, NULL);
+ _display_info(ev->object);
return EINA_TRUE;
}
@@ -74,8 +74,8 @@ static Eina_Bool
_frame_decode_cb(void *data EINA_UNUSED, const Eo_Event *ev)
{
printf(">>> Emotion object first frame decode.\n");
- eo_event_callback_del(ev->obj, EMOTION_OBJECT_EVENT_FRAME_DECODE,
_frame_decode_cb, NULL);
- _display_info(ev->obj);
+ eo_event_callback_del(ev->object, EMOTION_OBJECT_EVENT_FRAME_DECODE,
_frame_decode_cb, NULL);
+ _display_info(ev->object);
return EINA_TRUE;
}
@@ -84,7 +84,7 @@ static Eina_Bool
_decode_stop_cb(void *data EINA_UNUSED, const Eo_Event *ev)
{
printf(">>> Emotion object decode stop.\n");
- _display_info(ev->obj);
+ _display_info(ev->object);
return EINA_TRUE;
}
@@ -93,7 +93,7 @@ static Eina_Bool
_frame_resize_cb(void *data EINA_UNUSED, const Eo_Event *ev)
{
printf(">>> Emotion object frame resize.\n");
- _display_info(ev->obj);
+ _display_info(ev->object);
return EINA_TRUE;
}
--
