From 0ece5b18cdd57fc75ad4dffbdec735425e388f59 Mon Sep 17 00:00:00 2001 From: SooChan Lim Date: Mon, 14 Dec 2020 15:33:33 +0900 Subject: [PATCH] e_output: expose the enum values. if not, the file which includes e_output.h makes build error. Change-Id: I48d13bd3e37b974acc30e46c3cce79628c6b3049 --- src/bin/e_output.h | 69 +++++++++++++++++++++------------------------- 1 file changed, 31 insertions(+), 38 deletions(-) diff --git a/src/bin/e_output.h b/src/bin/e_output.h index e9935e95ff..706bcefdee 100644 --- a/src/bin/e_output.h +++ b/src/bin/e_output.h @@ -4,15 +4,42 @@ typedef struct _E_Output E_Output; typedef struct _E_Output_Mode E_Output_Mode; -typedef enum _E_Output_Dpms E_OUTPUT_DPMS; -typedef enum _E_Output_Display_Mode E_Output_Display_Mode; +typedef enum _E_Output_Dpms +{ + E_OUTPUT_DPMS_ON, + E_OUTPUT_DPMS_STANDBY, + E_OUTPUT_DPMS_SUSPEND, + E_OUTPUT_DPMS_OFF, +} E_OUTPUT_DPMS; + +typedef enum _E_Output_Display_Mode +{ + E_OUTPUT_DISPLAY_MODE_NONE, + E_OUTPUT_DISPLAY_MODE_MIRROR, + E_OUTPUT_DISPLAY_MODE_PRESENTATION, +} E_Output_Display_Mode; typedef struct _E_Output_Hook E_Output_Hook; -typedef enum _E_Output_Hook_Point E_Output_Hook_Point; +typedef enum _E_Output_Hook_Point +{ + E_OUTPUT_HOOK_DPMS_CHANGE, + E_OUTPUT_HOOK_CONNECT_STATUS_CHANGE, + E_OUTPUT_HOOK_MODE_CHANGE, + E_OUTPUT_HOOK_ADD, + E_OUTPUT_HOOK_REMOVE, + E_OUTPUT_HOOK_LAST +} E_Output_Hook_Point; typedef void (*E_Output_Hook_Cb) (void *data, E_Output *output); typedef struct _E_Output_Intercept_Hook E_Output_Intercept_Hook; -typedef enum _E_Output_Intercept_Hook_Point E_Output_Intercept_Hook_Point; +typedef enum _E_Output_Intercept_Hook_Point +{ + E_OUTPUT_INTERCEPT_HOOK_DPMS_ON, + E_OUTPUT_INTERCEPT_HOOK_DPMS_STANDBY, + E_OUTPUT_INTERCEPT_HOOK_DPMS_SUSPEND, + E_OUTPUT_INTERCEPT_HOOK_DPMS_OFF, + E_OUTPUT_INTERCEPT_HOOK_LAST +} E_Output_Intercept_Hook_Point; typedef Eina_Bool (*E_Output_Intercept_Hook_Cb) (void *data, E_Output *output); typedef void (*E_Output_Capture_Cb) (E_Output *output, tbm_surface_h surface, void *user_data); @@ -27,21 +54,6 @@ typedef void (*E_Output_Capture_Cb) (E_Output *output, tbm_surface_h surface, vo #define OUTPUT_NAME_LEN 64 -enum _E_Output_Dpms -{ - E_OUTPUT_DPMS_ON, - E_OUTPUT_DPMS_STANDBY, - E_OUTPUT_DPMS_SUSPEND, - E_OUTPUT_DPMS_OFF, -}; - -enum _E_Output_Display_Mode -{ - E_OUTPUT_DISPLAY_MODE_NONE, - E_OUTPUT_DISPLAY_MODE_MIRROR, - E_OUTPUT_DISPLAY_MODE_PRESENTATION, -}; - struct _E_Output_Mode { int w, h; // resolution width and height @@ -140,16 +152,6 @@ struct _E_Output Eina_Bool fake_config; }; -enum _E_Output_Hook_Point -{ - E_OUTPUT_HOOK_DPMS_CHANGE, - E_OUTPUT_HOOK_CONNECT_STATUS_CHANGE, - E_OUTPUT_HOOK_MODE_CHANGE, - E_OUTPUT_HOOK_ADD, - E_OUTPUT_HOOK_REMOVE, - E_OUTPUT_HOOK_LAST -}; - struct _E_Output_Hook { EINA_INLIST; @@ -159,15 +161,6 @@ struct _E_Output_Hook unsigned char delete_me : 1; }; -enum _E_Output_Intercept_Hook_Point -{ - E_OUTPUT_INTERCEPT_HOOK_DPMS_ON, - E_OUTPUT_INTERCEPT_HOOK_DPMS_STANDBY, - E_OUTPUT_INTERCEPT_HOOK_DPMS_SUSPEND, - E_OUTPUT_INTERCEPT_HOOK_DPMS_OFF, - E_OUTPUT_INTERCEPT_HOOK_LAST -}; - struct _E_Output_Intercept_Hook { EINA_INLIST; -- 2.34.1