enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

config: Implement support for audio_mute 

Instead of being a key "audio_mute" + another key "channel"
I've simply implemented a number of different keys:
audio_mute (= all)
audio_mute_all
audio_mute_effect
...
This commit is contained in:
Jean-Philippe Andre 2016-06-23 20:02:41 +09:00
parent 07613bf2f6
commit 3ee261780a
2 changed files with 95 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/lib/elementary/elm_config.c
View File

@ -4295,6 +4295,36 @@ _eina_value_to_cstring(const Eina_Value *val, cstring *s)
return ret;
}
static inline Eina_Bool
_edje_channel_get(const char *channel, Edje_Channel *chan)
{
if (!*channel)
*chan = EDJE_CHANNEL_ALL;
else
{
if (!strcmp("_effect", channel))
*chan = EDJE_CHANNEL_EFFECT;
else if (!strcmp("_background", channel))
*chan = EDJE_CHANNEL_BACKGROUND;
else if (!strcmp("_music", channel))
*chan = EDJE_CHANNEL_MUSIC;
else if (!strcmp("_foreground", channel))
*chan = EDJE_CHANNEL_FOREGROUND;
else if (!strcmp("_interface", channel))
*chan = EDJE_CHANNEL_INTERFACE;
else if (!strcmp("_input", channel))
*chan = EDJE_CHANNEL_INPUT;
else if (!strcmp("_alert", channel))
*chan = EDJE_CHANNEL_ALERT;
else if (!strcmp("_all", channel))
*chan = EDJE_CHANNEL_ALL;
else
return EINA_FALSE;
}
return EINA_TRUE;
}
static const struct {
Efl_Ui_Focus_Autoscroll_Mode val;
const char *str;
@ -4463,7 +4493,6 @@ _efl_config_internal_efl_config_config_set(Eo *obj EINA_UNUSED, void *_pd EINA_U
//elm_config.h:EAPI void elm_config_color_overlay_unset(const char *color_class);
CONFIG_SETB(magnifier_enable);
CONFIG_SETD(magnifier_scale);
//audio_mute Edje_Channel channel,);
CONFIG_SETB(window_auto_focus_enable);
CONFIG_SETB(window_auto_focus_animate);
CONFIG_SETB(popup_scrollable);
@ -4471,6 +4500,27 @@ _efl_config_internal_efl_config_config_set(Eo *obj EINA_UNUSED, void *_pd EINA_U
CONFIG_SETD(transition_duration_factor);
CONFIG_SETS(web_backend);
const size_t len = sizeof("audio_mute") - 1;
if (!strncmp(name, "audio_mute", len))
{
const char *channel = name + len;
Edje_Channel chan;
int v;
if (!_eina_value_to_int(val, &v))
{
ERR("Invalid value type for config '%s' (got %s wanted int)",
name, eina_value_type_name_get(eina_value_type_get(val)));
return EINA_FALSE;
}
if (!_edje_channel_get(channel, &chan))
{
ERR("Unknown audio channel '%s'", channel);
return EINA_FALSE;
}
elm_config_audio_mute_set(chan, !!v);
return EINA_TRUE;
}
ERR("Config '%s' does not exist", name);
return EINA_FALSE;
}
@ -4575,7 +4625,6 @@ _efl_config_internal_efl_config_config_get(const Eo *obj EINA_UNUSED, void *_pd
//color_overlay_unset
CONFIG_GETB(magnifier_enable);
CONFIG_GETD(magnifier_scale);
//audio_mute
CONFIG_GETB(window_auto_focus_enable);
CONFIG_GETB(window_auto_focus_animate);
CONFIG_GETB(popup_scrollable);
@ -4583,6 +4632,23 @@ _efl_config_internal_efl_config_config_get(const Eo *obj EINA_UNUSED, void *_pd
CONFIG_GETD(transition_duration_factor);
CONFIG_GETS(web_backend);
const size_t len = sizeof("audio_mute") - 1;
if (!strncmp(name, "audio_mute", len))
{
const char *channel = name + len;
Edje_Channel chan;
Eina_Bool b;
if (!_edje_channel_get(channel, &chan))
{
ERR("Unknown audio channel '%s'", channel);
return NULL;
}
val = eina_value_new(EINA_VALUE_TYPE_UCHAR);
b = edje_audio_channel_mute_get(chan);
eina_value_set(val, b);
return val;
}
ERR("Config '%s' does not exist", name);
return NULL;
}

28
src/tests/elementary/elm_test_config.c
View File

@ -108,7 +108,6 @@ START_TEST (elm_config_eoapi)
//color_overlay_unset
CONFIG_CHKB(magnifier_enable, 0);
CONFIG_CHKD(magnifier_scale, 0);
//audio_mute
CONFIG_CHKB(window_auto_focus_enable, 0);
CONFIG_CHKB(window_auto_focus_animate, 0);
CONFIG_CHKB(popup_scrollable, 0);
@ -116,6 +115,33 @@ START_TEST (elm_config_eoapi)
CONFIG_CHKD(transition_duration_factor, 0);
CONFIG_CHKS(web_backend, old); // no value change (requires web support)
static const struct {
Edje_Channel chan;
const char *name;
} channels[] = {
{ EDJE_CHANNEL_EFFECT, "audio_mute_effect" },
{ EDJE_CHANNEL_BACKGROUND, "audio_mute_background" },
{ EDJE_CHANNEL_MUSIC, "audio_mute_music" },
{ EDJE_CHANNEL_FOREGROUND, "audio_mute_foreground" },
{ EDJE_CHANNEL_INTERFACE, "audio_mute_interface" },
{ EDJE_CHANNEL_INPUT, "audio_mute_input" },
{ EDJE_CHANNEL_ALERT, "audio_mute_alert" },
{ EDJE_CHANNEL_ALL, "audio_mute_all" },
{ EDJE_CHANNEL_ALL, "audio_mute" },
};
for (unsigned i = 0; i < (sizeof(channels) / sizeof(channels[0])); i++)
{
Eina_Bool b = elm_config_audio_mute_get(channels[i].chan);
if (b != efl_config_bool_get(cfg, channels[i].name))
fail(channels[i].name);
efl_config_bool_set(cfg, channels[i].name, !b);
if(efl_config_bool_get(cfg, channels[i].name) != !b)
fail(channels[i].name);
if(elm_config_audio_mute_get(channels[i].chan) != !b)
fail(channels[i].name);
}
elm_shutdown();
}
END_TEST