jf_simon
/
enlightenment_my
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

formatting 

SVN revision: 75659
This commit is contained in:
Mike Blumenkrantz 2012-08-24 13:03:16 +00:00
parent bc6ec24ec1
commit 610d4ca1d3
1 changed files with 352 additions and 355 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
src/modules/mixer/e_mod_main.c
View File

@ -51,7 +51,7 @@ _mixer_notify(const float val, E_Mixer_Instance *inst __UNUSED__)
if (val > 100.0 || val < 0.0)
return;
if (!(ctxt = (E_Mixer_Module_Context*)mixer_mod->data) || !ctxt->desktop_notification)
if (!(ctxt = (E_Mixer_Module_Context *)mixer_mod->data) || !ctxt->desktop_notification)
return;
ret = snprintf(buf, (sizeof(buf) - 1), "%s: %d%%", _("New volume"), (int)(val + 0.5));
@ -191,6 +191,7 @@ _mixer_module_configuration_alert(void *data)
e_util_dialog_show(_("Mixer Settings Updated"), "%s", (char *)data);
return ECORE_CALLBACK_CANCEL;
}
#endif
static E_Mixer_Module_Config *
@ -454,7 +455,7 @@ _mixer_popup_cb_mute_change(void *data, Evas_Object *obj, void *event __UNUSED__
}
static Evas_Object *
_mixer_popup_add_slider(E_Mixer_Instance *inst, int value, void (*cb) (void *data, Evas_Object *obj, void *event_info))
_mixer_popup_add_slider(E_Mixer_Instance *inst, int value, void (*cb)(void *data, Evas_Object *obj, void *event_info))
{
Evas_Object *slider = e_slider_add(inst->popup->win->evas);
evas_object_show(slider);
@ -622,7 +623,6 @@ _mixer_app_select_current(E_Dialog *dialog, E_Mixer_Instance *inst)
e_mixer_app_dialog_select(dialog, conf->card, conf->channel_name);
}
static void
_mixer_popup_cb_mixer(void *data, void *data2 __UNUSED__)
{
@ -901,7 +901,6 @@ _mixer_sys_setup_default_card(E_Mixer_Instance *inst)
conf->card = card;
return 1;
system_error:
eina_stringshare_del(card);
error:
@ -1111,7 +1110,7 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__)
static const char *
_gc_label(const E_Gadcon_Client_Class *client_class __UNUSED__)
{
return (char*)_(_e_mixer_Name);
return (char *)_(_e_mixer_Name);
}
static Evas_Object *
@ -1150,8 +1149,6 @@ static const E_Gadcon_Client_Class _gc_class =
E_GADCON_CLIENT_STYLE_PLAIN
};
EAPI E_Module_Api e_modapi = {E_MODULE_API_VERSION, _e_mixer_Name};
static void
@ -1166,7 +1163,6 @@ _mixer_cb_volume_increase(E_Object *obj __UNUSED__, const char *params __UNUSED_
if (!ctxt->conf)
return;
if (!ctxt->default_instance)
return;
@ -1320,7 +1316,7 @@ _mixer_module_configuration_load(E_Config_DD *module_conf_edd)
if (!conf)
return _mixer_module_configuration_new();
if (conf && !e_util_module_config_check (_("Mixer Module"), conf->version,
if (conf && !e_util_module_config_check(_("Mixer Module"), conf->version,
MOD_CONFIG_FILE_VERSION))
{
_mixer_module_configuration_free(conf);
@ -1421,52 +1417,52 @@ _mixer_actions_unregister(E_Mixer_Module_Context *ctxt)
void
e_mixer_default_setup(void)
{
e_mod_mixer_volume_get = (void*)e_mixer_system_get_volume;
e_mod_mixer_volume_set = (void*)e_mixer_system_set_volume;
e_mod_mixer_mute_get = (void*)e_mixer_system_get_mute;
e_mod_mixer_mute_set = (void*)e_mixer_system_set_mute;
e_mod_mixer_mutable_get = (void*)e_mixer_system_can_mute;
e_mod_mixer_state_get = (void*)e_mixer_system_get_state;
e_mod_mixer_capture_get = (void*)e_mixer_system_has_capture;
e_mod_mixer_new = (void*)e_mixer_system_new;
e_mod_mixer_del = (void*)e_mixer_system_del;
e_mod_mixer_channel_default_name_get = (void*)e_mixer_system_get_default_channel_name;
e_mod_mixer_channel_get_by_name = (void*)e_mixer_system_get_channel_by_name;
e_mod_mixer_channel_name_get = (void*)e_mixer_system_get_channel_name;
e_mod_mixer_channel_del = (void*)e_mixer_system_channel_del;
e_mod_mixer_channels_free = (void*)e_mixer_system_free_channels;
e_mod_mixer_channels_get = (void*)e_mixer_system_get_channels;
e_mod_mixer_channels_names_get = (void*)e_mixer_system_get_channels_names;
e_mod_mixer_card_name_get = (void*)e_mixer_system_get_card_name;
e_mod_mixer_cards_get = (void*)e_mixer_system_get_cards;
e_mod_mixer_cards_free = (void*)e_mixer_system_free_cards;
e_mod_mixer_card_default_get = (void*)e_mixer_system_get_default_card;
e_mod_mixer_volume_get = (void *)e_mixer_system_get_volume;
e_mod_mixer_volume_set = (void *)e_mixer_system_set_volume;
e_mod_mixer_mute_get = (void *)e_mixer_system_get_mute;
e_mod_mixer_mute_set = (void *)e_mixer_system_set_mute;
e_mod_mixer_mutable_get = (void *)e_mixer_system_can_mute;
e_mod_mixer_state_get = (void *)e_mixer_system_get_state;
e_mod_mixer_capture_get = (void *)e_mixer_system_has_capture;
e_mod_mixer_new = (void *)e_mixer_system_new;
e_mod_mixer_del = (void *)e_mixer_system_del;
e_mod_mixer_channel_default_name_get = (void *)e_mixer_system_get_default_channel_name;
e_mod_mixer_channel_get_by_name = (void *)e_mixer_system_get_channel_by_name;
e_mod_mixer_channel_name_get = (void *)e_mixer_system_get_channel_name;
e_mod_mixer_channel_del = (void *)e_mixer_system_channel_del;
e_mod_mixer_channels_free = (void *)e_mixer_system_free_channels;
e_mod_mixer_channels_get = (void *)e_mixer_system_get_channels;
e_mod_mixer_channels_names_get = (void *)e_mixer_system_get_channels_names;
e_mod_mixer_card_name_get = (void *)e_mixer_system_get_card_name;
e_mod_mixer_cards_get = (void *)e_mixer_system_get_cards;
e_mod_mixer_cards_free = (void *)e_mixer_system_free_cards;
e_mod_mixer_card_default_get = (void *)e_mixer_system_get_default_card;
_mixer_using_default = EINA_TRUE;
}
void
e_mixer_pulse_setup(void)
{
e_mod_mixer_volume_get = (void*)e_mixer_pulse_get_volume;
e_mod_mixer_volume_set = (void*)e_mixer_pulse_set_volume;
e_mod_mixer_mute_get = (void*)e_mixer_pulse_get_mute;
e_mod_mixer_mute_set = (void*)e_mixer_pulse_set_mute;
e_mod_mixer_mutable_get = (void*)e_mixer_pulse_can_mute;
e_mod_mixer_state_get = (void*)e_mixer_pulse_get_state;
e_mod_mixer_capture_get = (void*)e_mixer_pulse_has_capture;
e_mod_mixer_new = (void*)e_mixer_pulse_new;
e_mod_mixer_del = (void*)e_mixer_pulse_del;
e_mod_mixer_channel_default_name_get = (void*)e_mixer_pulse_get_default_channel_name;
e_mod_mixer_channel_get_by_name = (void*)e_mixer_pulse_get_channel_by_name;
e_mod_mixer_channel_name_get = (void*)e_mixer_pulse_get_channel_name;
e_mod_mixer_channel_del = (void*)e_mixer_pulse_channel_del;
e_mod_mixer_channels_free = (void*)e_mixer_pulse_free_channels;
e_mod_mixer_channels_get = (void*)e_mixer_pulse_get_channels;
e_mod_mixer_channels_names_get = (void*)e_mixer_pulse_get_channels_names;
e_mod_mixer_card_name_get = (void*)e_mixer_pulse_get_card_name;
e_mod_mixer_cards_get = (void*)e_mixer_pulse_get_cards;
e_mod_mixer_cards_free = (void*)e_mixer_pulse_free_cards;
e_mod_mixer_card_default_get = (void*)e_mixer_pulse_get_default_card;
e_mod_mixer_volume_get = (void *)e_mixer_pulse_get_volume;
e_mod_mixer_volume_set = (void *)e_mixer_pulse_set_volume;
e_mod_mixer_mute_get = (void *)e_mixer_pulse_get_mute;
e_mod_mixer_mute_set = (void *)e_mixer_pulse_set_mute;
e_mod_mixer_mutable_get = (void *)e_mixer_pulse_can_mute;
e_mod_mixer_state_get = (void *)e_mixer_pulse_get_state;
e_mod_mixer_capture_get = (void *)e_mixer_pulse_has_capture;
e_mod_mixer_new = (void *)e_mixer_pulse_new;
e_mod_mixer_del = (void *)e_mixer_pulse_del;
e_mod_mixer_channel_default_name_get = (void *)e_mixer_pulse_get_default_channel_name;
e_mod_mixer_channel_get_by_name = (void *)e_mixer_pulse_get_channel_by_name;
e_mod_mixer_channel_name_get = (void *)e_mixer_pulse_get_channel_name;
e_mod_mixer_channel_del = (void *)e_mixer_pulse_channel_del;
e_mod_mixer_channels_free = (void *)e_mixer_pulse_free_channels;
e_mod_mixer_channels_get = (void *)e_mixer_pulse_get_channels;
e_mod_mixer_channels_names_get = (void *)e_mixer_pulse_get_channels_names;
e_mod_mixer_card_name_get = (void *)e_mixer_pulse_get_card_name;
e_mod_mixer_cards_get = (void *)e_mixer_pulse_get_cards;
e_mod_mixer_cards_free = (void *)e_mixer_pulse_free_cards;
e_mod_mixer_card_default_get = (void *)e_mixer_pulse_get_default_card;
_mixer_using_default = EINA_FALSE;
}
@ -1552,3 +1548,4 @@ e_modapi_save(E_Module *m)
return e_config_domain_save(_conf_domain, ctxt->module_conf_edd, ctxt->conf);
}