aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/emotion
diff options
context:
space:
mode:
authorFelipe Magno de Almeida <felipe@expertisesolutions.com.br>2015-11-01 21:57:43 -0200
committerFelipe Magno de Almeida <felipe@expertisesolutions.com.br>2015-11-01 21:57:43 -0200
commitfa88a2337f4c1ed74dbe5f8e9b8ab9e80aa94215 (patch)
tree289d1f0e30abe7aeb9100ab9ed3e3a755d1c18b7 /src/lib/emotion
parentEo do: use the __thread directive when available to manage call stack. (diff)
downloadefl-devs/felipealmeida/eo_optimisations.tar.gz
Eo: Partial implementation to remove eo_dodevs/felipealmeida/eo_optimisations
Diffstat (limited to 'src/lib/emotion')
-rw-r--r--src/lib/emotion/emotion_smart.c78
1 files changed, 39 insertions, 39 deletions
diff --git a/src/lib/emotion/emotion_smart.c b/src/lib/emotion/emotion_smart.c
index ea1130e3fd..acc13ff905 100644
--- a/src/lib/emotion/emotion_smart.c
+++ b/src/lib/emotion/emotion_smart.c
@@ -236,15 +236,15 @@ EAPI Evas_Object *
emotion_object_add(Evas *evas)
{
Evas_Object *e;
- e = eo_add(MY_CLASS, evas);
+ eo_add(e, MY_CLASS, evas);
return e;
}
EOLIAN static Eo *
_emotion_object_eo_base_constructor(Eo *obj, Emotion_Object_Data *pd EINA_UNUSED)
{
- obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
- eo_do(obj, evas_obj_type_set(E_OBJ_NAME));
+ obj = eo_super_eo_constructor( MY_CLASS, obj);
+ eo_do(obj, evas_obj_type_set(obj, E_OBJ_NAME));
return obj;
}
@@ -350,7 +350,7 @@ EAPI Eina_Bool
emotion_object_file_set(Evas_Object *obj, const char *file)
{
Eina_Bool ret;
- return eo_do_ret(obj, ret, efl_file_set(file, NULL));
+ return eo_do_ret(obj, ret, efl_file_set(obj, file, NULL));
}
EOLIAN static Eina_Bool
@@ -413,7 +413,7 @@ EAPI const char *
emotion_object_file_get(const Evas_Object *obj)
{
const char *file = NULL;
- eo_do(obj, efl_file_get(&file, NULL));
+ eo_do(obj, efl_file_get(obj, &file, NULL));
return file;
}
@@ -624,7 +624,7 @@ emotion_object_keep_aspect_get(const Evas_Object *obj)
EAPI void
emotion_object_play_set(Evas_Object *obj, Eina_Bool play)
{
- eo_do(obj, efl_player_play_set(play));
+ eo_do(obj, efl_player_play_set(obj, play));
}
EOLIAN static void
@@ -649,7 +649,7 @@ EAPI Eina_Bool
emotion_object_play_get(const Evas_Object *obj)
{
Eina_Bool ret;
- return eo_do_ret(obj, ret, efl_player_play_get());
+ return eo_do_ret(obj, ret, efl_player_play_get(obj));
}
EOLIAN static Eina_Bool
@@ -662,7 +662,7 @@ _emotion_object_efl_player_play_get(Eo *obj EINA_UNUSED, Emotion_Object_Data *sd
EAPI void
emotion_object_position_set(Evas_Object *obj, double sec)
{
- eo_do(obj, efl_player_position_set(sec));
+ eo_do(obj, efl_player_position_set(obj, sec));
}
EOLIAN static void
@@ -688,7 +688,7 @@ EAPI double
emotion_object_position_get(const Evas_Object *obj)
{
double ret;
- return eo_do_ret(obj, ret, efl_player_position_get());
+ return eo_do_ret(obj, ret, efl_player_position_get(obj));
}
EOLIAN static double
@@ -713,7 +713,7 @@ EAPI Eina_Bool
emotion_object_seekable_get(const Evas_Object *obj)
{
Eina_Bool ret;
- return eo_do_ret(obj, ret, efl_player_seekable_get());
+ return eo_do_ret(obj, ret, efl_player_seekable_get(obj));
}
EAPI Eina_Bool
@@ -740,7 +740,7 @@ EAPI double
emotion_object_play_length_get(const Evas_Object *obj)
{
double ret;
- return eo_do_ret(obj, ret, efl_player_length_get());
+ return eo_do_ret(obj, ret, efl_player_length_get(obj));
}
EAPI void
@@ -749,7 +749,7 @@ emotion_object_size_get(const Evas_Object *obj, int *iw, int *ih)
if (iw) *iw = 0;
if (ih) *ih = 0;
- eo_do(obj, efl_image_load_size_get(iw, ih));
+ eo_do(obj, efl_image_load_size_get(obj, iw, ih));
}
EOLIAN static void
@@ -762,7 +762,7 @@ _emotion_object_efl_image_load_size_get(Eo *obj EINA_UNUSED, Emotion_Object_Data
EAPI void
emotion_object_smooth_scale_set(Evas_Object *obj, Eina_Bool smooth)
{
- eo_do(obj, efl_image_smooth_scale_set(smooth));
+ eo_do(obj, efl_image_smooth_scale_set(obj, smooth));
}
EOLIAN static void
@@ -775,7 +775,7 @@ EAPI Eina_Bool
emotion_object_smooth_scale_get(const Evas_Object *obj)
{
Eina_Bool ret;
- return eo_do_ret(obj, ret, efl_image_smooth_scale_get());
+ return eo_do_ret(obj, ret, efl_image_smooth_scale_get(obj));
}
EOLIAN static Eina_Bool
@@ -788,7 +788,7 @@ EAPI double
emotion_object_ratio_get(const Evas_Object *obj)
{
double ret;
- return eo_do_ret(obj, ret, efl_image_ratio_get());
+ return eo_do_ret(obj, ret, efl_image_ratio_get(obj));
}
EOLIAN static double
@@ -814,7 +814,7 @@ emotion_object_event_simple_send(Evas_Object *obj, Emotion_Event ev)
EAPI void
emotion_object_audio_volume_set(Evas_Object *obj, double vol)
{
- eo_do(obj, efl_player_audio_volume_set(vol));
+ eo_do(obj, efl_player_audio_volume_set(obj, vol));
}
EOLIAN static void
@@ -829,7 +829,7 @@ EAPI double
emotion_object_audio_volume_get(const Evas_Object *obj)
{
double ret;
- return eo_do_ret(obj, ret, efl_player_audio_volume_get());
+ return eo_do_ret(obj, ret, efl_player_audio_volume_get(obj));
}
EOLIAN static double
@@ -842,7 +842,7 @@ _emotion_object_efl_player_audio_volume_get(Eo *obj EINA_UNUSED, Emotion_Object_
EAPI void
emotion_object_audio_mute_set(Evas_Object *obj, Eina_Bool mute)
{
- eo_do(obj, efl_player_audio_mute_set(mute));
+ eo_do(obj, efl_player_audio_mute_set(obj, mute));
}
EOLIAN static void
@@ -857,7 +857,7 @@ EAPI Eina_Bool
emotion_object_audio_mute_get(const Evas_Object *obj)
{
Eina_Bool ret;
- return eo_do_ret(obj, ret, efl_player_audio_mute_get());
+ return eo_do_ret(obj, ret, efl_player_audio_mute_get(obj));
}
EOLIAN static Eina_Bool
@@ -1148,7 +1148,7 @@ EAPI double
emotion_object_progress_status_get(const Evas_Object *obj)
{
double ret;
- return eo_do_ret(obj, ret, efl_player_progress_get());
+ return eo_do_ret(obj, ret, efl_player_progress_get(obj));
}
EOLIAN static double
@@ -1319,7 +1319,7 @@ _eio_load_xattr_done(void *data, Eio_File *handler, double xattr_double)
emotion_object_position_set(evas_object_smart_parent_get(sd->obj), xattr_double);
eo_do(evas_object_smart_parent_get(sd->obj),
- eo_event_callback_call(EMOTION_OBJECT_EVENT_POSITION_LOAD_SUCCEED, NULL));
+ eo_event_callback_call(evas_object_smart_parent_get(sd->obj), EMOTION_OBJECT_EVENT_POSITION_LOAD_SUCCEED, NULL));
_eio_load_xattr_cleanup(sd, handler);
}
@@ -1329,7 +1329,7 @@ _eio_load_xattr_error(void *data, Eio_File *handler, int err EINA_UNUSED)
Emotion_Object_Data *sd = data;
eo_do(evas_object_smart_parent_get(sd->obj),
- eo_event_callback_call(EMOTION_OBJECT_EVENT_POSITION_LOAD_FAILED, NULL));
+ eo_event_callback_call(evas_object_smart_parent_get(sd->obj), EMOTION_OBJECT_EVENT_POSITION_LOAD_FAILED, NULL));
_eio_load_xattr_cleanup(sd, handler);
}
#endif
@@ -1390,7 +1390,7 @@ _eio_save_xattr_done(void *data, Eio_File *handler)
{
Emotion_Object_Data *sd = data;
- eo_do(sd->obj, eo_event_callback_call(EMOTION_OBJECT_EVENT_POSITION_SAVE_SUCCEED, NULL));
+ eo_do(sd->obj, eo_event_callback_call(sd->obj, EMOTION_OBJECT_EVENT_POSITION_SAVE_SUCCEED, NULL));
_eio_save_xattr_cleanup(sd, handler);
}
@@ -1399,7 +1399,7 @@ _eio_save_xattr_error(void *data, Eio_File *handler, int err EINA_UNUSED)
{
Emotion_Object_Data *sd = data;
- eo_do(sd->obj, eo_event_callback_call(EMOTION_OBJECT_EVENT_POSITION_SAVE_FAILED, NULL));
+ eo_do(sd->obj, eo_event_callback_call(sd->obj, EMOTION_OBJECT_EVENT_POSITION_SAVE_FAILED, NULL));
_eio_save_xattr_cleanup(sd, handler);
}
#endif
@@ -1493,7 +1493,7 @@ _emotion_frame_anim(void *data)
_emotion_video_pos_update(obj,
emotion_engine_instance_pos_get(sd->engine_instance),
emotion_engine_instance_len_get(sd->engine_instance));
- eo_do(obj, eo_event_callback_call(EMOTION_OBJECT_EVENT_FRAME_DECODE, NULL));
+ eo_do(obj, eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_FRAME_DECODE, NULL));
return EINA_FALSE;
}
@@ -1518,9 +1518,9 @@ _emotion_video_pos_update(Evas_Object *obj, double pos, double len)
sd->pos = pos;
sd->len = len;
if (npos) eo_do(obj,
- eo_event_callback_call(EMOTION_OBJECT_EVENT_POSITION_UPDATE, NULL));
+ eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_POSITION_UPDATE, NULL));
if (nlen) eo_do(obj,
- eo_event_callback_call(EMOTION_OBJECT_EVENT_LENGTH_CHANGE, NULL));
+ eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_LENGTH_CHANGE, NULL));
}
EAPI void
@@ -1549,7 +1549,7 @@ _emotion_frame_resize(Evas_Object *obj, int w, int h, double ratio)
if (changed)
{
evas_object_size_hint_request_set(obj, w, h);
- eo_do(obj, eo_event_callback_call(EMOTION_OBJECT_EVENT_FRAME_RESIZE, NULL));
+ eo_do(obj, eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_FRAME_RESIZE, NULL));
evas_object_geometry_get(obj, NULL, NULL, &w, &h);
_emotion_object_aspect_border_apply(obj, sd, w, h);
}
@@ -1573,7 +1573,7 @@ _emotion_decode_stop(Evas_Object *obj)
if (sd->play)
{
sd->play = 0;
- eo_do(obj, eo_event_callback_call(EMOTION_OBJECT_EVENT_DECODE_STOP, NULL));
+ eo_do(obj, eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_DECODE_STOP, NULL));
}
}
@@ -1589,26 +1589,26 @@ _emotion_open_done(Evas_Object *obj)
emotion_object_position_set(obj, sd->remember_jump);
if (sd->remember_play != sd->play)
emotion_object_play_set(obj, sd->remember_play);
- eo_do(obj, eo_event_callback_call(EMOTION_OBJECT_EVENT_OPEN_DONE, NULL));
+ eo_do(obj, eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_OPEN_DONE, NULL));
}
EAPI void
_emotion_playback_started(Evas_Object *obj)
{
- eo_do(obj, eo_event_callback_call(EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, NULL));
+ eo_do(obj, eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_PLAYBACK_STARTED, NULL));
}
EAPI void
_emotion_playback_finished(Evas_Object *obj)
{
- eo_do(obj, eo_event_callback_call(EMOTION_OBJECT_EVENT_PLAYBACK_FINISHED, NULL));
+ eo_do(obj, eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_PLAYBACK_FINISHED, NULL));
}
EAPI void
_emotion_audio_level_change(Evas_Object *obj)
{
- eo_do(obj, eo_event_callback_call(EMOTION_OBJECT_EVENT_AUDIO_LEVEL_CHANGE, NULL));
+ eo_do(obj, eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_AUDIO_LEVEL_CHANGE, NULL));
}
EAPI void
@@ -1617,7 +1617,7 @@ _emotion_channels_change(Evas_Object *obj)
Emotion_Object_Data *sd;
E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME);
- eo_do(obj, eo_event_callback_call(EMOTION_OBJECT_EVENT_CHANNELS_CHANGE, NULL));
+ eo_do(obj, eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_CHANNELS_CHANGE, NULL));
}
EAPI void
@@ -1627,7 +1627,7 @@ _emotion_title_set(Evas_Object *obj, char *title)
E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME);
eina_stringshare_replace(&sd->title, title);
- eo_do(obj, eo_event_callback_call(EMOTION_OBJECT_EVENT_TITLE_CHANGE, NULL));
+ eo_do(obj, eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_TITLE_CHANGE, NULL));
}
@@ -1639,7 +1639,7 @@ _emotion_progress_set(Evas_Object *obj, char *info, double st)
E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME);
eina_stringshare_replace(&sd->progress.info, info);
sd->progress.stat = st;
- eo_do(obj, eo_event_callback_call(EMOTION_OBJECT_EVENT_PROGRESS_CHANGE, NULL));
+ eo_do(obj, eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_PROGRESS_CHANGE, NULL));
}
EAPI void
@@ -1650,7 +1650,7 @@ _emotion_file_ref_set(Evas_Object *obj, const char *file, int num)
E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME);
eina_stringshare_replace(&sd->ref.file, file);
sd->ref.num = num;
- eo_do(obj, eo_event_callback_call(EMOTION_OBJECT_EVENT_REF_CHANGE, NULL));
+ eo_do(obj, eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_REF_CHANGE, NULL));
}
EAPI void
@@ -1660,7 +1660,7 @@ _emotion_spu_button_num_set(Evas_Object *obj, int num)
E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME);
sd->spu.button_num = num;
- eo_do(obj, eo_event_callback_call(EMOTION_OBJECT_EVENT_BUTTON_NUM_CHANGE, NULL));
+ eo_do(obj, eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_BUTTON_NUM_CHANGE, NULL));
}
EAPI void
@@ -1670,7 +1670,7 @@ _emotion_spu_button_set(Evas_Object *obj, int button)
E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME);
sd->spu.button = button;
- eo_do(obj, eo_event_callback_call(EMOTION_OBJECT_EVENT_BUTTON_CHANGE, NULL));
+ eo_do(obj, eo_event_callback_call(obj, EMOTION_OBJECT_EVENT_BUTTON_CHANGE, NULL));
}
EAPI void