summaryrefslogtreecommitdiff
path: root/src/modules
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2017-01-06 09:57:46 -0800
committerCedric BAIL <cedric@osg.samsung.com>2017-01-06 15:58:46 -0800
commit8f1c071d6adbf6f8e2002eeeabdc7f3d7be9ef22 (patch)
tree17bddaa85bcdead8807053b009d1adf1c9eda71c /src/modules
parentf9928b75c8c4a2e6c3f02aafb68c8a569a47ab04 (diff)
eina: rename EINA_{FLT,DBL}_CMP to EINA_{FLT,DBL}_EQ.
Diffstat (limited to '')
-rw-r--r--src/modules/ecore_evas/engines/drm/ecore_evas_drm.c2
-rw-r--r--src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c10
-rw-r--r--src/modules/ecore_evas/engines/x/ecore_evas_x.c2
-rw-r--r--src/modules/emotion/gstreamer1/emotion_sink.c2
-rw-r--r--src/modules/emotion/xine/emotion_xine.c4
5 files changed, 10 insertions, 10 deletions
diff --git a/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c b/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
index d69c43009c..911b4692d9 100644
--- a/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
+++ b/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
@@ -549,7 +549,7 @@ _drm_transparent_set(Ecore_Evas *ee, int transparent)
549static void 549static void
550_drm_aspect_set(Ecore_Evas *ee, double aspect) 550_drm_aspect_set(Ecore_Evas *ee, double aspect)
551{ 551{
552 if (EINA_FLT_CMP(ee->prop.aspect, aspect)) return; 552 if (EINA_FLT_EQ(ee->prop.aspect, aspect)) return;
553 ee->prop.aspect = aspect; 553 ee->prop.aspect = aspect;
554} 554}
555 555
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
index cd883c0292..9e0af0de0c 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
@@ -939,7 +939,7 @@ _ecore_evas_wl_common_resize(Ecore_Evas *ee, int w, int h)
939 if (bh < 1) bh = 1; 939 if (bh < 1) bh = 1;
940 a = ((double)bw / (double)bh); 940 a = ((double)bw / (double)bh);
941 941
942 if ((!EINA_FLT_CMP(ee->prop.aspect, 0.0) && 942 if ((!EINA_FLT_EQ(ee->prop.aspect, 0.0) &&
943 (a < ee->prop.aspect))) 943 (a < ee->prop.aspect)))
944 { 944 {
945 if ((h < ee->h) > 0) 945 if ((h < ee->h) > 0)
@@ -950,7 +950,7 @@ _ecore_evas_wl_common_resize(Ecore_Evas *ee, int w, int h)
950 w = bw + ee->prop.base.w; 950 w = bw + ee->prop.base.w;
951 h = bh + ee->prop.base.h; 951 h = bh + ee->prop.base.h;
952 } 952 }
953 else if ((!EINA_FLT_CMP(ee->prop.aspect, 0.0)) && 953 else if ((!EINA_FLT_EQ(ee->prop.aspect, 0.0)) &&
954 (a > ee->prop.aspect)) 954 (a > ee->prop.aspect))
955 { 955 {
956 bw = bh * ee->prop.aspect; 956 bw = bh * ee->prop.aspect;
@@ -960,7 +960,7 @@ _ecore_evas_wl_common_resize(Ecore_Evas *ee, int w, int h)
960 else 960 else
961 { 961 {
962 a = ((double)w / (double)h); 962 a = ((double)w / (double)h);
963 if ((!EINA_FLT_CMP(ee->prop.aspect, 0.0)) && 963 if ((!EINA_FLT_EQ(ee->prop.aspect, 0.0)) &&
964 (a < ee->prop.aspect)) 964 (a < ee->prop.aspect))
965 { 965 {
966 if ((h < ee->h) > 0) 966 if ((h < ee->h) > 0)
@@ -968,7 +968,7 @@ _ecore_evas_wl_common_resize(Ecore_Evas *ee, int w, int h)
968 else 968 else
969 h = w / ee->prop.aspect; 969 h = w / ee->prop.aspect;
970 } 970 }
971 else if ((!EINA_FLT_CMP(ee->prop.aspect, 0.0)) && 971 else if ((!EINA_FLT_EQ(ee->prop.aspect, 0.0)) &&
972 (a > ee->prop.aspect)) 972 (a > ee->prop.aspect))
973 w = h * ee->prop.aspect; 973 w = h * ee->prop.aspect;
974 } 974 }
@@ -1272,7 +1272,7 @@ _ecore_evas_wl_common_aspect_set(Ecore_Evas *ee, double aspect)
1272 LOGFN(__FILE__, __LINE__, __FUNCTION__); 1272 LOGFN(__FILE__, __LINE__, __FUNCTION__);
1273 1273
1274 if (!ee) return; 1274 if (!ee) return;
1275 if (EINA_FLT_CMP(ee->prop.aspect, aspect)) return; 1275 if (EINA_FLT_EQ(ee->prop.aspect, aspect)) return;
1276 ee->prop.aspect = aspect; 1276 ee->prop.aspect = aspect;
1277} 1277}
1278 1278
diff --git a/src/modules/ecore_evas/engines/x/ecore_evas_x.c b/src/modules/ecore_evas/engines/x/ecore_evas_x.c
index 7949326ee3..af3f56bc19 100644
--- a/src/modules/ecore_evas/engines/x/ecore_evas_x.c
+++ b/src/modules/ecore_evas/engines/x/ecore_evas_x.c
@@ -2968,7 +2968,7 @@ _ecore_evas_x_window_group_set(Ecore_Evas *ee, const Ecore_Evas *group_ee)
2968static void 2968static void
2969_ecore_evas_x_aspect_set(Ecore_Evas *ee, double aspect) 2969_ecore_evas_x_aspect_set(Ecore_Evas *ee, double aspect)
2970{ 2970{
2971 if (EINA_FLT_CMP(ee->prop.aspect, aspect)) return; 2971 if (EINA_FLT_EQ(ee->prop.aspect, aspect)) return;
2972 2972
2973 ee->prop.aspect = aspect; 2973 ee->prop.aspect = aspect;
2974 _ecore_evas_x_size_pos_hints_update(ee); 2974 _ecore_evas_x_size_pos_hints_update(ee);
diff --git a/src/modules/emotion/gstreamer1/emotion_sink.c b/src/modules/emotion/gstreamer1/emotion_sink.c
index c31f3652de..47ed4d2825 100644
--- a/src/modules/emotion/gstreamer1/emotion_sink.c
+++ b/src/modules/emotion/gstreamer1/emotion_sink.c
@@ -345,7 +345,7 @@ _update_emotion_fps(EmotionVideoSinkPrivate *priv)
345 tim = ecore_time_get(); 345 tim = ecore_time_get();
346 priv->frames++; 346 priv->frames++;
347 347
348 if (EINA_DBL_CMP(priv->rlapse, 0.0)) 348 if (EINA_DBL_EQ(priv->rlapse, 0.0))
349 { 349 {
350 priv->rlapse = tim; 350 priv->rlapse = tim;
351 priv->flapse = priv->frames; 351 priv->flapse = priv->frames;
diff --git a/src/modules/emotion/xine/emotion_xine.c b/src/modules/emotion/xine/emotion_xine.c
index d7bf5692e7..b0bca12c1a 100644
--- a/src/modules/emotion/xine/emotion_xine.c
+++ b/src/modules/emotion/xine/emotion_xine.c
@@ -196,7 +196,7 @@ _em_slave(void *par)
196 196
197 pos = *((double *)eev->xine_event); 197 pos = *((double *)eev->xine_event);
198 if ((xine_get_param(ev->stream, XINE_PARAM_SPEED) == XINE_SPEED_PAUSE) && 198 if ((xine_get_param(ev->stream, XINE_PARAM_SPEED) == XINE_SPEED_PAUSE) &&
199 (EINA_DBL_CMP(pos, ev->pos)) && 199 (EINA_DBL_EQ(pos, ev->pos)) &&
200 (!ev->just_loaded)) 200 (!ev->just_loaded))
201 { 201 {
202 xine_set_param(ev->stream, XINE_PARAM_SPEED, XINE_SPEED_NORMAL); 202 xine_set_param(ev->stream, XINE_PARAM_SPEED, XINE_SPEED_NORMAL);
@@ -1324,7 +1324,7 @@ _em_fd_ev_active(void *data EINA_UNUSED, Ecore_Fd_Handler *fdh)
1324 ev->play_ok = 1; 1324 ev->play_ok = 1;
1325 break; 1325 break;
1326 case 15: /* get pos done */ 1326 case 15: /* get pos done */
1327 if (!EINA_DBL_CMP(ev->last_pos, ev->pos)) 1327 if (!EINA_DBL_EQ(ev->last_pos, ev->pos))
1328 { 1328 {
1329 ev->last_pos = ev->pos; 1329 ev->last_pos = ev->pos;
1330 _emotion_video_pos_update(ev->obj, ev->pos, ev->len); 1330 _emotion_video_pos_update(ev->obj, ev->pos, ev->len);