remove E_Comp_Screen_Iface

E_Comp_Screen_Iface is not used by e_comp anymore.

Change-Id: Iffcda3d214680d839a55f08449f7c5534af55c47

diff --git a/src/bin/e_comp.h b/src/bin/e_comp.h
index 3283dd0..29cf5f9 100644 (file)
--- a/src/bin/e_comp.h
+++ b/src/bin/e_comp.h
@@ -64,22 +64,6 @@ extern E_API int E_EVENT_COMPOSITOR_FPS_UPDATE;
 
 typedef void (*E_Comp_Cb)(void);
 
-typedef struct E_Comp_Screen_Iface
-{
-   /* can screen changes be made at all */
-   Eina_Bool (*available)(void);
-   /* begin listening for screen events */
-   void (*init)(void);
-   /* stop listening for screen events */
-   void (*shutdown)(void);
-   /* gather screen info */
-   E_Output *(*create)(void);
-   /* apply current config */
-   void (*apply)(void);
-   /* set dpms (on, standby, suspend, off) */
-   void (*dpms)(int);
-} E_Comp_Screen_Iface;
-
 typedef struct _E_Launch_Screen
 {
    Evas_Object *shobj;
@@ -148,8 +132,6 @@ struct _E_Comp
       void *data;
    } autoclose;
 
-   E_Comp_Screen_Iface *screen;
-
    E_Launch_Screen   *launchscrn;
 
    Eina_List *debug_rects;

diff --git a/src/bin/e_comp_drm.c b/src/bin/e_comp_drm.c
index 2c90486..20e9b50 100644 (file)
--- a/src/bin/e_comp_drm.c
+++ b/src/bin/e_comp_drm.c
@@ -338,17 +338,6 @@ e_comp_drm_create(void)
    return r;
 }
 
-EINTERN Eina_Bool
-e_comp_drm_available(void)
-{
-   return EINA_TRUE;
-}
-
-// TODO: will remove out after removing dependant e pkgs with E_Comp_Screen_Iface
-EINTERN void
-e_comp_drm_stub(void)
-{}
-
 EINTERN void
 e_comp_drm_apply(void)
 {
@@ -424,38 +413,6 @@ e_comp_drm_apply(void)
      }
 }
 
-EINTERN void
-e_comp_drm_dpms(int set)
-{
-   Ecore_Drm_Device *dev;
-   Ecore_Drm_Output *out;
-   E_Output_Screen *s;
-   const Eina_List *l, *ll;
-
-   EINA_LIST_FOREACH(ecore_drm_devices_get(), l, dev)
-     {
-        EINA_LIST_FOREACH(e_output->screens, ll, s)
-          {
-             out = ecore_drm_device_output_name_find(dev, s->info.name);
-             if (!out) continue;
-
-             //if ((!s->config.configured) || s->config.enabled)
-             ecore_drm_output_dpms_set(out, set);
-          }
-     }
-}
-
-// TODO: will remove out after removing dependant e pkgs with E_Comp_Screen_Iface
-static E_Comp_Screen_Iface drmiface =
-{
-   .available = e_comp_drm_available,
-   .init = e_comp_drm_stub,
-   .shutdown = e_comp_drm_stub,
-   .create = e_comp_drm_create,
-   .apply = e_comp_drm_apply,
-   .dpms = e_comp_drm_dpms,
-};
-
 static void
 _drm_read_pixels(E_Comp_Wl_Output *output, void *pixels)
 {
@@ -645,9 +602,6 @@ e_comp_drm_init()
 
    ecore_evas_callback_resize_set(e_comp->ee, _e_comp_drm_cb_ee_resize);
 
-   //TODO: will be remove out
-   e_comp->screen = &drmiface;
-
    e_main_ts("\tE_Output Init");
    if (!e_output_init())
      {

diff --git a/src/bin/e_comp_drm.h b/src/bin/e_comp_drm.h
index dd24578..792bb19 100644 (file)
--- a/src/bin/e_comp_drm.h
+++ b/src/bin/e_comp_drm.h
@@ -6,15 +6,12 @@
 #define E_COMP_DRM_H
 
 
-EINTERN Eina_Bool e_comp_drm_available(void);
-EINTERN void e_comp_drm_stub(void);
-EINTERN void e_comp_drm_apply(void);
-EINTERN E_Output * e_comp_drm_create(void);
-EINTERN void e_comp_drm_dpms(int set);
-
 E_API Eina_Bool e_comp_drm_init(void);
 E_API void e_comp_drm_shutdown(void);
 
+EINTERN E_Output * e_comp_drm_create(void);
+EINTERN void       e_comp_drm_apply(void);
+
 #endif /*E_COMP_DRM_H*/
 
 #endif

diff --git a/src/bin/e_output.c b/src/bin/e_output.c
index 12577ec..37e84f7 100644 (file)
--- a/src/bin/e_output.c
+++ b/src/bin/e_output.c
@@ -22,7 +22,6 @@ EINTERN Eina_Bool
 e_output_init(void)
 {
    if (!E_EVENT_SCREEN_CHANGE) E_EVENT_SCREEN_CHANGE = ecore_event_type_new();
-   if (!e_comp_drm_available()) return EINA_FALSE;
 
    _do_apply();