e_output: Add and modify apis for structure encapsulation

Change-Id: I7febd664b272f9815727c8078af06859767760f2

diff --git a/src/bin/e_output.c b/src/bin/e_output.c
index 5e11392..434977c 100644 (file)
--- a/src/bin/e_output.c
+++ b/src/bin/e_output.c
@@ -3063,7 +3063,7 @@ e_output_dpms_async_check(E_Output *output)
    return output->dpms_async;
 }
 
-EINTERN void
+E_API void
 e_output_size_get(E_Output *output, int *w, int *h)
 {
    EINA_SAFETY_ON_NULL_RETURN(output);
@@ -3209,7 +3209,7 @@ e_output_commit(E_Output *output)
    return EINA_TRUE;
 }
 
-EINTERN const char *
+E_API const char *
 e_output_output_id_get(E_Output *output)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(output, NULL);
@@ -3672,7 +3672,7 @@ e_output_intercept_hook_del(E_Output_Intercept_Hook *ch)
      _e_output_intercept_hooks_delete++;
 }
 
-EINTERN Eina_Bool
+E_API Eina_Bool
 e_output_capture(E_Output *output, tbm_surface_h tsurface, Eina_Bool auto_rotate, Eina_Bool sync, E_Output_Capture_Cb func, void *data)
 {
    Eina_Bool ret = EINA_FALSE;
@@ -4478,3 +4478,19 @@ _e_output_stream_capture_mask_image_deactivate(E_Output *output)
 
    E_FREE_FUNC(md->eo, evas_object_del);
 }
+
+E_API Eina_Bool
+e_output_mode_enabled_get(E_Output *output)
+{
+   EINA_SAFETY_ON_NULL_RETURN_VAL(output, EINA_FALSE);
+
+   return output->config.enabled;
+}
+
+E_API E_Hwc *
+e_output_hwc_get(E_Output *output)
+{
+   EINA_SAFETY_ON_NULL_RETURN_VAL(output, NULL);
+
+   return output->hwc;
+}

diff --git a/src/bin/e_output_intern.h b/src/bin/e_output_intern.h
index f171eff..b17bdea 100644 (file)
--- a/src/bin/e_output_intern.h
+++ b/src/bin/e_output_intern.h
@@ -68,14 +68,12 @@ EINTERN Eina_Bool         e_output_connected(E_Output *output);
 EINTERN Eina_Bool         e_output_dpms_set(E_Output *output, E_OUTPUT_DPMS val);
 EINTERN E_OUTPUT_DPMS     e_output_dpms_get(E_Output *output);
 EINTERN Eina_Bool         e_output_dpms_async_check(E_Output *output);
-EINTERN void              e_output_size_get(E_Output *output, int *w, int *h);
 EINTERN void              e_output_phys_size_get(E_Output *output, int *phys_w, int *phys_h);
 EINTERN E_Plane         * e_output_default_fb_target_get(E_Output *output);
 EINTERN Eina_Bool         e_output_fake_config_set(E_Output *output, int w, int h);
 EINTERN Eina_Bool         e_output_zoom_set(E_Output *output, double zoomx, double zoomy, int cx, int cy);
 EINTERN Eina_Bool         e_output_zoom_get(E_Output *output, double *zoomx, double *zoomy, int *cx, int *cy);
 EINTERN void              e_output_zoom_unset(E_Output *output);
-EINTERN Eina_Bool         e_output_capture(E_Output *output, tbm_surface_h surface, Eina_Bool auto_rotate, Eina_Bool sync, E_Output_Capture_Cb func, void *data);
 EINTERN Eina_Bool         e_output_stream_capture_queue(E_Output *output, tbm_surface_h surface, E_Output_Capture_Cb func, void *data);
 EINTERN Eina_Bool         e_output_stream_capture_dequeue(E_Output *output, tbm_surface_h surface);
 EINTERN Eina_Bool         e_output_stream_capture_start(E_Output *output);
@@ -83,7 +81,6 @@ EINTERN void              e_output_stream_capture_stop(E_Output *output);
 EINTERN void              e_output_stream_capture_autorotate(E_Output *output, Eina_Bool auto_rotate);
 EINTERN Eina_Bool         e_output_stream_capture_mask_image_file_set(E_Output *output, const char *file);
 EINTERN Eina_Bool         e_output_stream_capture_mask_image_geometry_set(E_Output *output, int x, int y, int w, int h);
-EINTERN const char      * e_output_output_id_get(E_Output *output);
 
 EINTERN Eina_Bool         e_output_external_mode_change(E_Output *output, E_Output_Mode *mode);
 EINTERN Eina_Bool         e_output_mirror_set(E_Output *output, E_Output *src_output);

diff --git a/src/include/e_output.h b/src/include/e_output.h
index 261a836..b78d66d 100644 (file)
--- a/src/include/e_output.h
+++ b/src/include/e_output.h
@@ -151,13 +151,19 @@ typedef struct _output_prop {
    output_prop_value_type type;
 } output_prop;
 
-E_API E_Output          * e_output_find(const char *id);
-E_API E_Output          * e_output_find_by_index(int index);
-E_API const Eina_List   * e_output_planes_get(E_Output *output);
-E_API E_Plane           * e_output_plane_get_by_zpos(E_Output *output, int zpos);
-
-E_API Eina_Bool           e_output_available_properties_get(E_Output *output, const output_prop **props, int *count);
-E_API Eina_Bool           e_output_property_get(E_Output *output, unsigned int id, output_prop_value *value);
-E_API Eina_Bool           e_output_property_set(E_Output *output, unsigned int id, output_prop_value value);
+E_API E_Output          *e_output_find(const char *id);
+E_API E_Output          *e_output_find_by_index(int index);
+E_API const Eina_List   *e_output_planes_get(E_Output *output);
+E_API E_Plane           *e_output_plane_get_by_zpos(E_Output *output, int zpos);
+
+E_API Eina_Bool          e_output_available_properties_get(E_Output *output, const output_prop **props, int *count);
+E_API Eina_Bool          e_output_property_get(E_Output *output, unsigned int id, output_prop_value *value);
+E_API Eina_Bool          e_output_property_set(E_Output *output, unsigned int id, output_prop_value value);
+
+E_API void               e_output_size_get(E_Output *output, int *w, int *h);
+E_API Eina_Bool          e_output_capture(E_Output *output, tbm_surface_h surface, Eina_Bool auto_rotate, Eina_Bool sync, E_Output_Capture_Cb func, void *data);
+E_API const char        *e_output_output_id_get(E_Output *output);
+E_API Eina_Bool          e_output_mode_enabled_get(E_Output *output);
+E_API E_Hwc             *e_output_hwc_get(E_Output *output);
 
 #endif