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

cleanups... 

i did this module long ago, without a proper indentation settings in my emacs...



SVN revision: 47124
This commit is contained in:
Gustavo Sverzut Barbieri 2010-03-10 21:54:23 +00:00
parent 6177180010
commit 2a1229013a
5 changed files with 450 additions and 525 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/modules/mixer/app_mixer.c
View File

@ -60,7 +60,7 @@ struct channel_info
}; };
static void static void
_cb_changed_left(void *data, Evas_Object *obj) _cb_changed_left(void *data, Evas_Object *obj __UNUSED__)
{ {
E_Mixer_App_Dialog_Data *app = data; E_Mixer_App_Dialog_Data *app = data;
E_Mixer_Channel_State *state; E_Mixer_Channel_State *state;
@ -78,7 +78,7 @@ _cb_changed_left(void *data, Evas_Object *obj)
} }
static void static void
_cb_changed_right(void *data, Evas_Object *obj) _cb_changed_right(void *data, Evas_Object *obj __UNUSED__)
{ {
E_Mixer_App_Dialog_Data *app = data; E_Mixer_App_Dialog_Data *app = data;
E_Mixer_Channel_State *state; E_Mixer_Channel_State *state;
@ -96,7 +96,7 @@ _cb_changed_right(void *data, Evas_Object *obj)
} }
static void static void
_cb_changed_mute(void *data, Evas_Object *obj) _cb_changed_mute(void *data, Evas_Object *obj __UNUSED__)
{ {
E_Mixer_App_Dialog_Data *app = data; E_Mixer_App_Dialog_Data *app = data;
@ -104,7 +104,7 @@ _cb_changed_mute(void *data, Evas_Object *obj)
} }
static void static void
_cb_changed_lock_sliders(void *data, Evas_Object *obj) _cb_changed_lock_sliders(void *data, Evas_Object *obj __UNUSED__)
{ {
E_Mixer_App_Dialog_Data *app = data; E_Mixer_App_Dialog_Data *app = data;
E_Mixer_Channel_State *state; E_Mixer_Channel_State *state;
@ -127,9 +127,7 @@ _cb_changed_lock_sliders(void *data, Evas_Object *obj)
static void static void
_update_channel_editor_state(E_Mixer_App_Dialog_Data *app, const E_Mixer_Channel_State state) _update_channel_editor_state(E_Mixer_App_Dialog_Data *app, const E_Mixer_Channel_State state)
{ {
struct e_mixer_app_ui_channel_editor *ui; struct e_mixer_app_ui_channel_editor *ui = &app->ui.channel_editor;
ui = &app->ui.channel_editor;
e_widget_slider_value_int_set(ui->left, state.left); e_widget_slider_value_int_set(ui->left, state.left);
e_widget_slider_value_int_set(ui->right, state.right); e_widget_slider_value_int_set(ui->right, state.right);
@ -149,12 +147,10 @@ _update_channel_editor_state(E_Mixer_App_Dialog_Data *app, const E_Mixer_Channel
static void static void
_populate_channel_editor(E_Mixer_App_Dialog_Data *app) _populate_channel_editor(E_Mixer_App_Dialog_Data *app)
{ {
struct e_mixer_app_ui_channel_editor *ui; struct e_mixer_app_ui_channel_editor *ui = &app->ui.channel_editor;
E_Mixer_Channel_State state; E_Mixer_Channel_State state;
const char *card_name; const char *card_name;
ui = &app->ui.channel_editor;
card_name = e_mixer_system_get_card_name(app->card); card_name = e_mixer_system_get_card_name(app->card);
e_widget_entry_text_set(ui->card, card_name); e_widget_entry_text_set(ui->card, card_name);
eina_stringshare_del(card_name); eina_stringshare_del(card_name);
@ -233,13 +229,11 @@ _channels_info_free(Eina_List *list)
} }
static int static int
_cb_system_update(void *data, E_Mixer_System *sys) _cb_system_update(void *data, E_Mixer_System *sys __UNUSED__)
{ {
E_Mixer_App_Dialog_Data *app; E_Mixer_App_Dialog_Data *app = data;
E_Mixer_Channel_State state; E_Mixer_Channel_State state;
app = data;
if ((!app->sys) || (!app->channel_info)) if ((!app->sys) || (!app->channel_info))
return 1; return 1;
@ -333,9 +327,9 @@ _cb_card_selected(void *data)
} }
static void static void
_create_cards(E_Dialog *dialog, Evas *evas, E_Mixer_App_Dialog_Data *app) _create_cards(E_Dialog *dialog __UNUSED__, Evas *evas, E_Mixer_App_Dialog_Data *app)
{ {
struct e_mixer_app_ui_cards *ui; struct e_mixer_app_ui_cards *ui = &app->ui.cards;
const char *card; const char *card;
Eina_List *l; Eina_List *l;
@ -344,7 +338,6 @@ _create_cards(E_Dialog *dialog, Evas *evas, E_Mixer_App_Dialog_Data *app)
if (eina_list_count(app->cards) < 2) if (eina_list_count(app->cards) < 2)
return; return;
ui = &app->ui.cards;
ui->list = e_widget_ilist_add(evas, 32, 32, &app->card); ui->list = e_widget_ilist_add(evas, 32, 32, &app->card);
e_widget_size_min_set(ui->list, 180, 100); e_widget_size_min_set(ui->list, 180, 100);
e_widget_ilist_go(ui->list); e_widget_ilist_go(ui->list);
@ -366,11 +359,9 @@ _create_cards(E_Dialog *dialog, Evas *evas, E_Mixer_App_Dialog_Data *app)
} }
static void static void
_create_channels(E_Dialog *dialog, Evas *evas, E_Mixer_App_Dialog_Data *app) _create_channels(E_Dialog *dialog __UNUSED__, Evas *evas, E_Mixer_App_Dialog_Data *app)
{ {
struct e_mixer_app_ui_channels *ui; struct e_mixer_app_ui_channels *ui = &app->ui.channels;
ui = &app->ui.channels;
ui->list = e_widget_ilist_add(evas, 24, 24, &app->channel_name); ui->list = e_widget_ilist_add(evas, 24, 24, &app->channel_name);
e_widget_size_min_set(ui->list, 180, 100); e_widget_size_min_set(ui->list, 180, 100);
e_widget_ilist_go(ui->list); e_widget_ilist_go(ui->list);
@ -381,11 +372,9 @@ _create_channels(E_Dialog *dialog, Evas *evas, E_Mixer_App_Dialog_Data *app)
} }
static void static void
_create_channel_editor(E_Dialog *dialog, Evas *evas, E_Mixer_App_Dialog_Data *app) _create_channel_editor(E_Dialog *dialog __UNUSED__, Evas *evas, E_Mixer_App_Dialog_Data *app)
{ {
struct e_mixer_app_ui_channel_editor *ui; struct e_mixer_app_ui_channel_editor *ui = &app->ui.channel_editor;
ui = &app->ui.channel_editor;
ui->label_card = e_widget_label_add(evas, _("Card:")); ui->label_card = e_widget_label_add(evas, _("Card:"));
ui->card = e_widget_entry_add(evas, NULL, NULL, NULL, NULL); ui->card = e_widget_entry_add(evas, NULL, NULL, NULL, NULL);
@ -436,14 +425,12 @@ _create_channel_editor(E_Dialog *dialog, Evas *evas, E_Mixer_App_Dialog_Data *ap
static void static void
_create_ui(E_Dialog *dialog, E_Mixer_App_Dialog_Data *app) _create_ui(E_Dialog *dialog, E_Mixer_App_Dialog_Data *app)
{ {
struct e_mixer_app_ui *ui; struct e_mixer_app_ui *ui = &app->ui;
Evas *evas; Evas *evas;
int mw, mh; int mw, mh;
evas = e_win_evas_get(dialog->win); evas = e_win_evas_get(dialog->win);
ui = &app->ui;
ui->hlayout = e_widget_list_add(evas, 0, 1); ui->hlayout = e_widget_list_add(evas, 0, 1);
_create_cards(dialog, evas, app); _create_cards(dialog, evas, app);
_create_channels(dialog, evas, app); _create_channels(dialog, evas, app);
@ -485,12 +472,8 @@ _mixer_app_dialog_del(E_Dialog *dialog, E_Mixer_App_Dialog_Data *app)
static void static void
_cb_win_del(E_Win *win) _cb_win_del(E_Win *win)
{ {
E_Dialog *dialog; E_Dialog *dialog = win->data;
E_Mixer_App_Dialog_Data *app; E_Mixer_App_Dialog_Data *app = dialog->data;
dialog = win->data;
app = dialog->data;
_mixer_app_dialog_del(dialog, app); _mixer_app_dialog_del(dialog, app);
} }

38
src/modules/mixer/conf_gadget.c
View File

@ -120,10 +120,9 @@ _create_data(E_Config_Dialog *dialog)
static void static void
_free_data(E_Config_Dialog *dialog, E_Config_Dialog_Data *cfdata) _free_data(E_Config_Dialog *dialog, E_Config_Dialog_Data *cfdata)
{ {
E_Mixer_Gadget_Config *conf; E_Mixer_Gadget_Config *conf = dialog->data;
const char *card; const char *card;
conf = dialog->data;
if (conf) if (conf)
conf->dialog = NULL; conf->dialog = NULL;
@ -149,10 +148,9 @@ _free_data(E_Config_Dialog *dialog, E_Config_Dialog_Data *cfdata)
static int static int
_basic_apply(E_Config_Dialog *dialog, E_Config_Dialog_Data *cfdata) _basic_apply(E_Config_Dialog *dialog, E_Config_Dialog_Data *cfdata)
{ {
E_Mixer_Gadget_Config *conf; E_Mixer_Gadget_Config *conf = dialog->data;
const char *card, *channel; const char *card, *channel;
conf = dialog->data;
conf->lock_sliders = cfdata->lock_sliders; conf->lock_sliders = cfdata->lock_sliders;
conf->show_locked = cfdata->show_locked; conf->show_locked = cfdata->show_locked;
@ -175,20 +173,16 @@ _basic_apply(E_Config_Dialog *dialog, E_Config_Dialog_Data *cfdata)
} }
static void static void
_lock_change(void *data, Evas_Object *obj, void *event) _lock_change(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__)
{ {
E_Config_Dialog_Data *cfdata; E_Config_Dialog_Data *cfdata = data;
cfdata = data;
e_widget_disabled_set(cfdata->ui.general.show_locked, !cfdata->lock_sliders); e_widget_disabled_set(cfdata->ui.general.show_locked, !cfdata->lock_sliders);
} }
static void static void
_basic_create_general(Evas *evas, E_Config_Dialog_Data *cfdata) _basic_create_general(Evas *evas, E_Config_Dialog_Data *cfdata)
{ {
struct mixer_config_ui_general *ui; struct mixer_config_ui_general *ui = &cfdata->ui.general;
ui = &cfdata->ui.general;
ui->frame = e_widget_framelist_add(evas, _("General Settings"), 0); ui->frame = e_widget_framelist_add(evas, _("General Settings"), 0);
@ -216,14 +210,13 @@ _clear_channels(E_Config_Dialog_Data *cfdata)
static void static void
_fill_channels(Evas *evas, E_Config_Dialog_Data *cfdata) _fill_channels(Evas *evas, E_Config_Dialog_Data *cfdata)
{ {
struct mixer_config_ui_channels *ui; struct mixer_config_ui_channels *ui = &cfdata->ui.channels;;
Evas_Object *selected; Evas_Object *selected;
Evas_Coord mw, mh; Evas_Coord mw, mh;
const char *name; const char *name;
Eina_List *l; Eina_List *l;
int i = 0; int i = 0;
ui = &cfdata->ui.channels;
ui->radio = e_widget_radio_group_new(&cfdata->channel); ui->radio = e_widget_radio_group_new(&cfdata->channel);
EINA_LIST_FOREACH(cfdata->channels_names, l, name) EINA_LIST_FOREACH(cfdata->channels_names, l, name)
{ {
@ -258,9 +251,7 @@ static void
_channel_scroll_set_min_size(struct mixer_config_ui_channels *ui) _channel_scroll_set_min_size(struct mixer_config_ui_channels *ui)
{ {
Evas_Coord w, h; Evas_Coord w, h;
int len; int len = eina_list_count(ui->radios);
len = eina_list_count(ui->radios);
if (len < 1) if (len < 1)
return; return;
@ -272,9 +263,8 @@ _channel_scroll_set_min_size(struct mixer_config_ui_channels *ui)
static void static void
_basic_create_channels(Evas *evas, E_Config_Dialog_Data *cfdata) _basic_create_channels(Evas *evas, E_Config_Dialog_Data *cfdata)
{ {
struct mixer_config_ui_channels *ui; struct mixer_config_ui_channels *ui = &cfdata->ui.channels;
ui = &cfdata->ui.channels;
ui->list = e_widget_list_add(evas, 1, 0); ui->list = e_widget_list_add(evas, 1, 0);
ui->scroll = e_widget_scrollframe_simple_add(evas, ui->list); ui->scroll = e_widget_scrollframe_simple_add(evas, ui->list);
ui->frame = e_widget_framelist_add(evas, _("Channels"), 0); ui->frame = e_widget_framelist_add(evas, _("Channels"), 0);
@ -286,14 +276,12 @@ _basic_create_channels(Evas *evas, E_Config_Dialog_Data *cfdata)
} }
static void static void
_card_change(void *data, Evas_Object *obj, void *event) _card_change(void *data, Evas_Object *obj, void *event __UNUSED__)
{ {
E_Config_Dialog_Data *cfdata; E_Config_Dialog_Data *cfdata = data;
Evas *evas; Evas *evas;
char *card; char *card;
cfdata = data;
eina_stringshare_del(cfdata->card); eina_stringshare_del(cfdata->card);
e_mixer_system_free_channels_names(cfdata->channels_names); e_mixer_system_free_channels_names(cfdata->channels_names);
@ -312,13 +300,11 @@ _card_change(void *data, Evas_Object *obj, void *event)
static void static void
_basic_create_cards(Evas *evas, E_Config_Dialog_Data *cfdata) _basic_create_cards(Evas *evas, E_Config_Dialog_Data *cfdata)
{ {
struct mixer_config_ui_cards *ui; struct mixer_config_ui_cards *ui = &cfdata->ui.cards;
const char *card; const char *card;
Eina_List *l; Eina_List *l;
int i = 0; int i = 0;
ui = &cfdata->ui.cards;
ui->frame = e_widget_framelist_add(evas, _("Sound Cards"), 0); ui->frame = e_widget_framelist_add(evas, _("Sound Cards"), 0);
ui->radio = e_widget_radio_group_new(&cfdata->card_num); ui->radio = e_widget_radio_group_new(&cfdata->card_num);
EINA_LIST_FOREACH(cfdata->cards_names, l, card) EINA_LIST_FOREACH(cfdata->cards_names, l, card)
@ -336,7 +322,7 @@ _basic_create_cards(Evas *evas, E_Config_Dialog_Data *cfdata)
} }
static Evas_Object * static Evas_Object *
_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata)
{ {
if (!cfdata) if (!cfdata)
return NULL; return NULL;

19
src/modules/mixer/conf_module.c
View File

@ -48,9 +48,7 @@ _create_data(E_Config_Dialog *dialog)
static void static void
_free_data(E_Config_Dialog *dialog, E_Config_Dialog_Data *cfdata) _free_data(E_Config_Dialog *dialog, E_Config_Dialog_Data *cfdata)
{ {
E_Mixer_Module_Context *ctxt; E_Mixer_Module_Context *ctxt = dialog->data;
ctxt = dialog->data;
if (ctxt) if (ctxt)
ctxt->conf_dialog = NULL; ctxt->conf_dialog = NULL;
@ -60,9 +58,7 @@ _free_data(E_Config_Dialog *dialog, E_Config_Dialog_Data *cfdata)
static int static int
_basic_apply(E_Config_Dialog *dialog, E_Config_Dialog_Data *cfdata) _basic_apply(E_Config_Dialog *dialog, E_Config_Dialog_Data *cfdata)
{ {
E_Mixer_Module_Context *ctxt; E_Mixer_Module_Context *ctxt = dialog->data;
ctxt = dialog->data;
ctxt->default_instance = eina_list_nth(ctxt->instances, ctxt->default_instance = eina_list_nth(ctxt->instances,
cfdata->default_instance); cfdata->default_instance);
if (ctxt->default_instance) if (ctxt->default_instance)
@ -84,15 +80,12 @@ _basic_apply(E_Config_Dialog *dialog, E_Config_Dialog_Data *cfdata)
static void static void
_basic_create_general(E_Config_Dialog *dialog, Evas *evas, E_Config_Dialog_Data *cfdata) _basic_create_general(E_Config_Dialog *dialog, Evas *evas, E_Config_Dialog_Data *cfdata)
{ {
struct mixer_config_ui_general *ui; struct mixer_config_ui_general *ui = &cfdata->ui.general;
E_Mixer_Module_Context *ctxt; E_Mixer_Module_Context *ctxt = dialog->data;
Evas_Object *label; Evas_Object *label;
Eina_List *l; Eina_List *l;
int i; int i;
ui = &cfdata->ui.general;
ctxt = dialog->data;
ui->frame = e_widget_framelist_add(evas, _("General Settings"), 0); ui->frame = e_widget_framelist_add(evas, _("General Settings"), 0);
label = e_widget_label_add(evas, _("Mixer to use for global actions:")); label = e_widget_label_add(evas, _("Mixer to use for global actions:"));
@ -122,14 +115,14 @@ _basic_create_general(E_Config_Dialog *dialog, Evas *evas, E_Config_Dialog_Data
} }
static void static void
cb_mixer_app_del(E_Dialog *dialog, void *data) cb_mixer_app_del(E_Dialog *dialog __UNUSED__, void *data)
{ {
E_Mixer_Module_Context *ctxt = data; E_Mixer_Module_Context *ctxt = data;
ctxt->mixer_dialog = NULL; ctxt->mixer_dialog = NULL;
} }
static void static void
cb_mixer_call(void *data, void *data2) cb_mixer_call(void *data, void *data2 __UNUSED__)
{ {
E_Mixer_Module_Context *ctxt = data; E_Mixer_Module_Context *ctxt = data;
E_Container *con; E_Container *con;

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

@ -12,7 +12,7 @@ const char *
e_mixer_theme_path(void) e_mixer_theme_path(void)
{ {
#define TF "/e-module-mixer.edj" #define TF "/e-module-mixer.edj"
int dirlen; size_t dirlen;
dirlen = strlen(mixer_mod->dir); dirlen = strlen(mixer_mod->dir);
if (dirlen >= sizeof(tmpbuf) - sizeof(TF)) if (dirlen >= sizeof(tmpbuf) - sizeof(TF))
@ -111,7 +111,7 @@ _mixer_gadget_configuration_free(E_Mixer_Module_Config *mod_conf, E_Mixer_Gadget
} }
static Eina_Bool static Eina_Bool
_mixer_gadget_configuration_free_foreach(const Eina_Hash *hash, const void *key, void *hdata, void *fdata) _mixer_gadget_configuration_free_foreach(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *hdata, void *fdata __UNUSED__)
{ {
_mixer_gadget_configuration_free_int(hdata); _mixer_gadget_configuration_free_int(hdata);
return 1; return 1;
@ -317,16 +317,11 @@ _mixer_toggle_mute(E_Mixer_Instance *inst)
} }
static void static void
_mixer_popup_cb_volume_left_change(void *data, Evas_Object *obj, void *event) _mixer_popup_cb_volume_left_change(void *data, Evas_Object *obj, void *event __UNUSED__)
{ {
E_Mixer_Instance *inst; E_Mixer_Instance *inst = data;
E_Mixer_Channel_State *state; E_Mixer_Channel_State *state = &inst->mixer_state;
inst = data;
if (!inst)
return;
state = &inst->mixer_state;
e_mixer_system_get_volume(inst->sys, inst->channel, e_mixer_system_get_volume(inst->sys, inst->channel,
&state->left, &state->right); &state->left, &state->right);
@ -343,16 +338,11 @@ _mixer_popup_cb_volume_left_change(void *data, Evas_Object *obj, void *event)
} }
static void static void
_mixer_popup_cb_volume_right_change(void *data, Evas_Object *obj, void *event) _mixer_popup_cb_volume_right_change(void *data, Evas_Object *obj, void *event __UNUSED__)
{ {
E_Mixer_Instance *inst; E_Mixer_Instance *inst = data;
E_Mixer_Channel_State *state; E_Mixer_Channel_State *state = &inst->mixer_state;
inst = data;
if (!inst)
return;
state = &inst->mixer_state;
e_mixer_system_get_volume(inst->sys, inst->channel, e_mixer_system_get_volume(inst->sys, inst->channel,
&state->left, &state->right); &state->left, &state->right);
@ -369,16 +359,11 @@ _mixer_popup_cb_volume_right_change(void *data, Evas_Object *obj, void *event)
} }
static void static void
_mixer_popup_cb_mute_change(void *data, Evas_Object *obj, void *event) _mixer_popup_cb_mute_change(void *data, Evas_Object *obj, void *event __UNUSED__)
{ {
E_Mixer_Instance *inst; E_Mixer_Instance *inst = data;
E_Mixer_Channel_State *state; E_Mixer_Channel_State *state = &inst->mixer_state;
inst = data;
if (!inst)
return;
state = &inst->mixer_state;
state->mute = e_widget_check_checked_get(obj); state->mute = e_widget_check_checked_get(obj);
e_mixer_system_set_mute(inst->sys, inst->channel, state->mute); e_mixer_system_set_mute(inst->sys, inst->channel, state->mute);
@ -388,9 +373,7 @@ _mixer_popup_cb_mute_change(void *data, Evas_Object *obj, void *event)
static Evas_Object * 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; Evas_Object *slider = e_slider_add(inst->popup->win->evas);
slider = e_slider_add(inst->popup->win->evas);
evas_object_show(slider); evas_object_show(slider);
e_slider_orientation_set(slider, 0); e_slider_orientation_set(slider, 0);
e_slider_value_set(slider, value); e_slider_value_set(slider, value);
@ -402,7 +385,7 @@ _mixer_popup_add_slider(E_Mixer_Instance *inst, int value, void (*cb) (void *dat
} }
static void static void
_mixer_app_cb_del(E_Dialog *dialog, void *data) _mixer_app_cb_del(E_Dialog *dialog __UNUSED__, void *data)
{ {
E_Mixer_Module_Context *ctxt = data; E_Mixer_Module_Context *ctxt = data;
ctxt->mixer_dialog = NULL; ctxt->mixer_dialog = NULL;
@ -411,7 +394,7 @@ _mixer_app_cb_del(E_Dialog *dialog, void *data)
static void _mixer_popup_del(E_Mixer_Instance *inst); static void _mixer_popup_del(E_Mixer_Instance *inst);
static int static int
_mixer_popup_input_window_mouse_up_cb(void *data, int type, void *event) _mixer_popup_input_window_mouse_up_cb(void *data, int type __UNUSED__, void *event)
{ {
Ecore_Event_Mouse_Button *ev = event; Ecore_Event_Mouse_Button *ev = event;
E_Mixer_Instance *inst = data; E_Mixer_Instance *inst = data;
@ -425,7 +408,7 @@ _mixer_popup_input_window_mouse_up_cb(void *data, int type, void *event)
} }
static int static int
_mixer_popup_input_window_key_down_cb(void *data, int type, void *event) _mixer_popup_input_window_key_down_cb(void *data, int type __UNUSED__, void *event)
{ {
Ecore_Event_Key *ev = event; Ecore_Event_Key *ev = event;
E_Mixer_Instance *inst = data; E_Mixer_Instance *inst = data;
@ -515,7 +498,7 @@ _mixer_app_select_current(E_Dialog *dialog, E_Mixer_Instance *inst)
static void static void
_mixer_popup_cb_mixer(void *data, void *data2) _mixer_popup_cb_mixer(void *data, void *data2 __UNUSED__)
{ {
E_Mixer_Instance *inst = data; E_Mixer_Instance *inst = data;
E_Mixer_Module_Context *ctxt; E_Mixer_Module_Context *ctxt;
@ -616,11 +599,9 @@ _mixer_popup_new(E_Mixer_Instance *inst)
} }
static void static void
_mixer_menu_cb_post(void *data, E_Menu *menu) _mixer_menu_cb_post(void *data, E_Menu *menu __UNUSED__)
{ {
E_Mixer_Instance *inst; E_Mixer_Instance *inst = data;
inst = data;
if ((!inst) || (!inst->menu)) if ((!inst) || (!inst->menu))
return; return;
if (inst->menu) if (inst->menu)
@ -631,14 +612,11 @@ _mixer_menu_cb_post(void *data, E_Menu *menu)
} }
static void static void
_mixer_menu_cb_cfg(void *data, E_Menu *menu, E_Menu_Item *mi) _mixer_menu_cb_cfg(void *data, E_Menu *menu __UNUSED__, E_Menu_Item *mi __UNUSED__)
{ {
E_Mixer_Instance *inst; E_Mixer_Instance *inst = data;
E_Container *con; E_Container *con;
inst = data;
if (!inst)
return;
if (inst->popup) if (inst->popup)
_mixer_popup_del(inst); _mixer_popup_del(inst);
con = e_container_current_get(e_manager_current_get()); con = e_container_current_get(e_manager_current_get());
@ -673,16 +651,11 @@ _mixer_menu_new(E_Mixer_Instance *inst, Evas_Event_Mouse_Down *ev)
} }
static void static void
_mixer_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event) _mixer_cb_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event)
{ {
E_Mixer_Instance *inst; E_Mixer_Instance *inst = data;
Evas_Event_Mouse_Down *ev; Evas_Event_Mouse_Down *ev = event;
inst = data;
if (!inst)
return;
ev = event;
if (ev->button == 1) if (ev->button == 1)
{ {
if (!inst->popup) if (!inst->popup)
@ -697,16 +670,11 @@ _mixer_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event)
} }
static void static void
_mixer_cb_mouse_wheel(void *data, Evas *evas, Evas_Object *obj, void *event) _mixer_cb_mouse_wheel(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event)
{ {
E_Mixer_Instance *inst; E_Mixer_Instance *inst = data;
Evas_Event_Mouse_Wheel *ev; Evas_Event_Mouse_Wheel *ev = event;
inst = data;
if (!inst)
return;
ev = event;
if (ev->direction == 0) if (ev->direction == 0)
{ {
if (ev->z > 0) if (ev->z > 0)
@ -746,11 +714,9 @@ _mixer_sys_setup(E_Mixer_Instance *inst)
} }
static int static int
_mixer_system_cb_update(void *data, E_Mixer_System *sys) _mixer_system_cb_update(void *data, E_Mixer_System *sys __UNUSED__)
{ {
E_Mixer_Instance *inst; E_Mixer_Instance *inst = data;
inst = data;
e_mixer_system_get_state(inst->sys, inst->channel, &inst->mixer_state); e_mixer_system_get_state(inst->sys, inst->channel, &inst->mixer_state);
_mixer_gadget_update(inst); _mixer_gadget_update(inst);
@ -943,30 +909,28 @@ _gc_shutdown(E_Gadcon_Client *gcc)
} }
static void static void
_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient) _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__)
{ {
e_gadcon_client_aspect_set(gcc, 16, 16); e_gadcon_client_aspect_set(gcc, 16, 16);
e_gadcon_client_min_size_set(gcc, 16, 16); e_gadcon_client_min_size_set(gcc, 16, 16);
} }
static char * static char *
_gc_label(E_Gadcon_Client_Class *client_class) _gc_label(E_Gadcon_Client_Class *client_class __UNUSED__)
{ {
return _(_e_mixer_Name); return _(_e_mixer_Name);
} }
static Evas_Object * static Evas_Object *
_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas) _gc_icon(E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas)
{ {
Evas_Object *o; Evas_Object *o = edje_object_add(evas);
o = edje_object_add(evas);
edje_object_file_set(o, e_mixer_theme_path(), "icon"); edje_object_file_set(o, e_mixer_theme_path(), "icon");
return o; return o;
} }
static const char * static const char *
_gc_id_new(E_Gadcon_Client_Class *client_class) _gc_id_new(E_Gadcon_Client_Class *client_class __UNUSED__)
{ {
E_Mixer_Module_Context *ctxt; E_Mixer_Module_Context *ctxt;
Eina_List *instances; Eina_List *instances;
@ -998,7 +962,7 @@ static const E_Gadcon_Client_Class _gc_class =
EAPI E_Module_Api e_modapi = {E_MODULE_API_VERSION, _e_mixer_Name}; EAPI E_Module_Api e_modapi = {E_MODULE_API_VERSION, _e_mixer_Name};
static void static void
_mixer_cb_volume_increase(E_Object *obj, const char *params) _mixer_cb_volume_increase(E_Object *obj __UNUSED__, const char *params __UNUSED__)
{ {
E_Mixer_Module_Context *ctxt; E_Mixer_Module_Context *ctxt;
@ -1014,7 +978,7 @@ _mixer_cb_volume_increase(E_Object *obj, const char *params)
} }
static void static void
_mixer_cb_volume_decrease(E_Object *obj, const char *params) _mixer_cb_volume_decrease(E_Object *obj __UNUSED__, const char *params __UNUSED__)
{ {
E_Mixer_Module_Context *ctxt; E_Mixer_Module_Context *ctxt;
@ -1030,7 +994,7 @@ _mixer_cb_volume_decrease(E_Object *obj, const char *params)
} }
static void static void
_mixer_cb_volume_mute(E_Object *obj, const char *params) _mixer_cb_volume_mute(E_Object *obj __UNUSED__, const char *params __UNUSED__)
{ {
E_Mixer_Module_Context *ctxt; E_Mixer_Module_Context *ctxt;
@ -1254,9 +1218,7 @@ _mixer_instances_free(E_Mixer_Module_Context *ctxt)
{ {
while (ctxt->instances) while (ctxt->instances)
{ {
E_Mixer_Instance *inst; E_Mixer_Instance *inst = ctxt->instances->data;
inst = ctxt->instances->data;
e_object_del(E_OBJECT(inst->gcc)); e_object_del(E_OBJECT(inst->gcc));
} }
} }

11
src/modules/mixer/sys_alsa.c
View File

@ -5,6 +5,7 @@
#include <alloca.h> #include <alloca.h>
#include <Ecore.h> #include <Ecore.h>
#include "e_mod_system.h" #include "e_mod_system.h"
#include "e.h"
struct e_mixer_callback_desc struct e_mixer_callback_desc
{ {
@ -127,7 +128,7 @@ _mixer_callback_del(E_Mixer_System *self, struct e_mixer_callback_desc *desc)
} }
static int static int
_mixer_callback_replace(E_Mixer_System *self, struct e_mixer_callback_desc *desc, int (*func)(void *data, E_Mixer_System *self), void *data) _mixer_callback_replace(E_Mixer_System *self __UNUSED__, struct e_mixer_callback_desc *desc, int (*func)(void *data, E_Mixer_System *self), void *data)
{ {
desc->func = func; desc->func = func;
desc->data = data; desc->data = data;
@ -162,9 +163,9 @@ e_mixer_system_new(const char *name)
return handle; return handle;
error_load: error_load:
snd_mixer_close(handle); snd_mixer_close(handle);
error_open: error_open:
fprintf(stderr, "MIXER: Cannot get hardware info: %s\n", snd_strerror(err)); fprintf(stderr, "MIXER: Cannot get hardware info: %s\n", snd_strerror(err));
return NULL; return NULL;
} }
@ -174,7 +175,7 @@ e_mixer_system_del(E_Mixer_System *self)
{ {
struct e_mixer_callback_desc *desc; struct e_mixer_callback_desc *desc;
if (self <= 0) if (!self)
return; return;
desc = snd_mixer_get_callback_private(self); desc = snd_mixer_get_callback_private(self);
@ -420,7 +421,7 @@ e_mixer_system_get_channel_by_name(E_Mixer_System *self, const char *name)
} }
void void
e_mixer_system_channel_del(E_Mixer_Channel *channel) e_mixer_system_channel_del(E_Mixer_Channel *channel __UNUSED__)
{ {
} }