summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDerek Foreman <derekf@osg.samsung.com>2017-08-08 12:02:15 -0500
committerDerek Foreman <derekf@osg.samsung.com>2017-08-09 14:56:59 -0500
commit846db0e0e7ad3cff1fac4437e378c28e60c68bf2 (patch)
tree30a004ad26f4056efb652b329913c3ef9ae2de14
parent1b853dcfadfdea9e10bf4bca0ea7a24d990af68f (diff)
ecore_drm2: Remove ecore_drm2_output_geometry_get()
Replaced with ecore_drm2_output_info_get()
-rw-r--r--src/lib/ecore_drm2/Ecore_Drm2.h14
-rw-r--r--src/lib/ecore_drm2/ecore_drm2_outputs.c12
-rw-r--r--src/modules/ecore_evas/engines/drm/ecore_evas_drm.c4
3 files changed, 2 insertions, 28 deletions
diff --git a/src/lib/ecore_drm2/Ecore_Drm2.h b/src/lib/ecore_drm2/Ecore_Drm2.h
index ef35304c35..d979881867 100644
--- a/src/lib/ecore_drm2/Ecore_Drm2.h
+++ b/src/lib/ecore_drm2/Ecore_Drm2.h
@@ -476,20 +476,6 @@ EAPI Eina_Bool ecore_drm2_output_backlight_get(Ecore_Drm2_Output *output);
476EAPI Ecore_Drm2_Output *ecore_drm2_output_find(Ecore_Drm2_Device *device, int x, int y); 476EAPI Ecore_Drm2_Output *ecore_drm2_output_find(Ecore_Drm2_Device *device, int x, int y);
477 477
478/** 478/**
479 * Get the geometry of a given output
480 *
481 * @param output
482 * @param x
483 * @param y
484 * @param w
485 * @param h
486 *
487 * @ingroup Ecore_Drm2_Output_Group
488 * @since 1.18
489 */
490EAPI void ecore_drm2_output_geometry_get(Ecore_Drm2_Output *output, int *x, int *y, int *w, int *h);
491
492/**
493 * Get the dpi of a given output 479 * Get the dpi of a given output
494 * 480 *
495 * @param output 481 * @param output
diff --git a/src/lib/ecore_drm2/ecore_drm2_outputs.c b/src/lib/ecore_drm2/ecore_drm2_outputs.c
index f3f13081b0..7cf8198adc 100644
--- a/src/lib/ecore_drm2/ecore_drm2_outputs.c
+++ b/src/lib/ecore_drm2/ecore_drm2_outputs.c
@@ -1118,18 +1118,6 @@ ecore_drm2_output_find(Ecore_Drm2_Device *device, int x, int y)
1118} 1118}
1119 1119
1120EAPI void 1120EAPI void
1121ecore_drm2_output_geometry_get(Ecore_Drm2_Output *output, int *x, int *y, int *w, int *h)
1122{
1123 EINA_SAFETY_ON_NULL_RETURN(output);
1124 EINA_SAFETY_ON_TRUE_RETURN(!output->enabled);
1125
1126 if (x) *x = output->x;
1127 if (y) *y = output->y;
1128 if (w) *w = output->current_mode->width;
1129 if (h) *h = output->current_mode->height;
1130}
1131
1132EAPI void
1133ecore_drm2_output_dpi_get(Ecore_Drm2_Output *output, int *xdpi, int *ydpi) 1121ecore_drm2_output_dpi_get(Ecore_Drm2_Output *output, int *xdpi, int *ydpi)
1134{ 1122{
1135 EINA_SAFETY_ON_NULL_RETURN(output); 1123 EINA_SAFETY_ON_NULL_RETURN(output);
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 be1bd38567..6d031daef6 100644
--- a/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
+++ b/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
@@ -246,7 +246,7 @@ _drm_screen_geometry_get(const Ecore_Evas *ee, int *x, int *y, int *w, int *h)
246 Ecore_Evas_Engine_Drm_Data *edata; 246 Ecore_Evas_Engine_Drm_Data *edata;
247 247
248 edata = ee->engine.data; 248 edata = ee->engine.data;
249 ecore_drm2_output_geometry_get(edata->output, x, y, w, h); 249 ecore_drm2_output_info_get(edata->output, x, y, w, h, NULL);
250} 250}
251 251
252static void 252static void
@@ -490,7 +490,7 @@ _drm_fullscreen_set(Ecore_Evas *ee, Eina_Bool on)
490 edata->w = ee->w; 490 edata->w = ee->w;
491 edata->h = ee->h; 491 edata->h = ee->h;
492 492
493 ecore_drm2_output_geometry_get(edata->output, NULL, NULL, &ow, &oh); 493 ecore_drm2_output_info_get(edata->output, NULL, NULL, &ow, &oh, NULL);
494 if ((ow == 0) || (oh == 0)) 494 if ((ow == 0) || (oh == 0))
495 { 495 {
496 ow = ee->w; 496 ow = ee->w;