devilhorns pushed a commit to branch master. http://git.enlightenment.org/apps/express.git/commit/?id=6afc0c1752497f96c91cd99d338cf623fbc22185
commit 6afc0c1752497f96c91cd99d338cf623fbc22185 Author: Chris Michael <[email protected]> Date: Wed Aug 12 11:48:49 2015 -0400 express: Add config options for video playback Signed-off-by: Chris Michael <[email protected]> --- src/bin/config.c | 12 +++++++++++- src/bin/config.h | 17 ++++++++++++----- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/src/bin/config.c b/src/bin/config.c index 8c1c601..e77ddbe 100644 --- a/src/bin/config.c +++ b/src/bin/config.c @@ -25,7 +25,7 @@ EET_DATA_DESCRIPTOR_ADD_HASH(edd, type, #member, member, eddtype) # define EX_CONFIG_FILE_EPOCH 0x0004 -# define EX_CONFIG_FILE_GENERATION 0x011d +# define EX_CONFIG_FILE_GENERATION 0x012d # define EX_CONFIG_FILE_VERSION \ ((EX_CONFIG_FILE_EPOCH << 16) | EX_CONFIG_FILE_GENERATION) @@ -198,6 +198,9 @@ _config_init(void) EX_CONFIG_VAL(D, T, gui.zoom, EET_T_DOUBLE); EX_CONFIG_VAL(D, T, gui.scrollback, EET_T_INT); EX_CONFIG_VAL(D, T, gui.tabs, EET_T_INT); + EX_CONFIG_VAL(D, T, video.module, EET_T_INT); + EX_CONFIG_VAL(D, T, video.muted, EET_T_UCHAR); + EX_CONFIG_VAL(D, T, video.visualized, EET_T_UCHAR); EX_CONFIG_LIST(D, T, networks, _ex_cfg_net_edd); _config_load(); @@ -280,10 +283,17 @@ _config_load(void) _ex_cfg->font.use_entry = EINA_TRUE; IFCFGEND; + IFCFG(0x012d); + _ex_cfg->video.module = 0; + _ex_cfg->video.muted = EINA_FALSE; + _ex_cfg->video.visualized = EINA_TRUE; + IFCFGEND; + /* limit config values so they are sane */ EX_CONFIG_LIMIT(_ex_cfg->font.size, 3, 400); EX_CONFIG_LIMIT(_ex_cfg->gui.zoom, 0.1, 1.0); EX_CONFIG_LIMIT(_ex_cfg->gui.scrollback, 0, 200000); + EX_CONFIG_LIMIT(_ex_cfg->video.module, 0, 4); _ex_cfg->version = EX_CONFIG_FILE_VERSION; diff --git a/src/bin/config.h b/src/bin/config.h index 3bd421a..1c8424c 100644 --- a/src/bin/config.h +++ b/src/bin/config.h @@ -14,8 +14,8 @@ struct _Config_Channel struct _Config_Server { - const char *name; int port; + const char *name; }; struct _Config_Network @@ -38,22 +38,29 @@ struct _Config struct { - const char *name; int size; + const char *name; Eina_Bool bitmap; Eina_Bool use_entry; } font; struct { - Eina_Bool translucent; - Eina_Bool use_gravatar; - int opacity; double zoom; + int opacity; int scrollback; int tabs; + Eina_Bool translucent; + Eina_Bool use_gravatar; } gui; + struct + { + int module; + Eina_Bool muted; + Eina_Bool visualized; + } video; + Eina_List *networks; }; --
