Enlightenment CVS committal Author : devilhorns Project : e_modules Module : evolume
Dir : e_modules/evolume/src/module Modified Files: e_mod_cmdialog.h e_mod_cmdialog.c e_mod_cdialog.c Log Message: Good bye EVolume Segfault :) Now Auto-Apply compliant too. =================================================================== RCS file: /cvs/e/e_modules/evolume/src/module/e_mod_cmdialog.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_mod_cmdialog.h 21 Mar 2006 02:12:20 -0000 1.1 +++ e_mod_cmdialog.h 28 Mar 2006 20:30:39 -0000 1.2 @@ -1,8 +1,6 @@ - #ifndef E_MOD_CMDIALOG_H_INCLUDED #define E_MOD_CMDIALOG_H_INCLUDED - -void e_volume_config_mixer(Volume_Face *face, Config_Mixer* mixer_conf); +void e_volume_config_mixer(void *data, void *data2); #endif// E_MOD_CMDIALOG_H_INCLUDED =================================================================== RCS file: /cvs/e/e_modules/evolume/src/module/e_mod_cmdialog.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_mod_cmdialog.c 21 Mar 2006 02:12:20 -0000 1.1 +++ e_mod_cmdialog.c 28 Mar 2006 20:30:39 -0000 1.2 @@ -32,31 +32,30 @@ static void _free_data(E_Config_Dialog *cfd, CFData *cfdata); static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata); static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata); -static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata); -static int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata); -void e_volume_config_mixer(Volume_Face *face, - Config_Mixer* mixer_conf) +void e_volume_config_mixer(void *data, void *data2) { + Volume_Face *face; + Config_Mixer *mixer_conf; E_Config_Dialog* cfd; - E_Config_Dialog_View v; + E_Config_Dialog_View *v; struct _cfg *c; - v.create_cfdata = _create_data; - v.free_cfdata = _free_data; - v.basic.apply_cfdata = _basic_apply_data; - v.basic.create_widgets = _basic_create_widgets; - v.advanced.apply_cfdata = NULL; - v.advanced.create_widgets = NULL; - /* - v.advanced.apply_cfdata = _advanced_apply_data; - v.advanced.create_widgets = _advanced_create_widgets; - */ + face = data; + mixer_conf = data2; + + v = E_NEW(E_Config_Dialog_View, 1); + v->create_cfdata = _create_data; + v->free_cfdata = _free_data; + v->basic.apply_cfdata = _basic_apply_data; + v->basic.create_widgets = _basic_create_widgets; + v->advanced.apply_cfdata = NULL; + v->advanced.create_widgets = NULL; c = malloc(sizeof(struct _cfg)); c->mixer_conf = mixer_conf; c->face = face; - cfd = e_config_dialog_new(face->con, _("Mixer Face Configuration"), NULL, 0, &v, c); + cfd = e_config_dialog_new(face->con, _("Mixer Face Configuration"), NULL, 0, v, c); } @@ -91,6 +90,7 @@ _free_data(E_Config_Dialog* cfd, CFData* cfdata) { Evas_List *l; + for(l = cfdata->elems; l; l = evas_list_next(l)) { Elem_CFData* d; @@ -119,11 +119,11 @@ o = e_widget_list_add(evas, 0, 0); of = e_widget_framelist_add(evas, D_("Mixer Configuration"), 0); - for(l = cfdata->elems, i = 0; l; l = evas_list_next(l), i++) + for(l = cfdata->elems, i = 0; l; l = l->next, i++) { Evas_Object *olabel, *oact, *obal, *ot; Elem_CFData* ecfd; - ecfd = evas_list_data(l); + ecfd = l->data; ot = e_widget_table_add(evas, 0); @@ -147,8 +147,9 @@ { Evas_List *l; struct _cfg* c; - c = cfd->data; int u; + + c = cfd->data; for(l = cfdata->elems; l; l = evas_list_next(l)) { Elem_CFData* ecfd; @@ -159,25 +160,8 @@ { ecfd->elem->active = ecfd->active; ecfd->elem->balance = ecfd->balance; - - e_volume_face_mixer_elem_update(c->face, - ecfd->elem, cfdata->mixer_conf); + e_volume_face_mixer_elem_update(c->face, ecfd->elem, cfdata->mixer_conf); } } return 1; } - - -static Evas_Object -*_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) - -{ - return NULL; -} - -static int -_advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata) -{ - return 1; -} - =================================================================== RCS file: /cvs/e/e_modules/evolume/src/module/e_mod_cdialog.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_mod_cdialog.c 21 Mar 2006 02:12:20 -0000 1.1 +++ e_mod_cdialog.c 28 Mar 2006 20:30:39 -0000 1.2 @@ -26,26 +26,21 @@ static void _free_data(E_Config_Dialog *cfd, CFData *cfdata); static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata); static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata); -static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata); -static int _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata); void e_volume_config_module(E_Container* con, Volume_Face *face) { E_Config_Dialog* cfd; - E_Config_Dialog_View v; + E_Config_Dialog_View *v; - v.create_cfdata = _create_data; - v.free_cfdata = _free_data; - v.basic.apply_cfdata = _basic_apply_data; - v.basic.create_widgets = _basic_create_widgets; - v.advanced.apply_cfdata = NULL; - v.advanced.create_widgets = NULL; - /* - v.advanced.apply_cfdata = _advanced_apply_data; - v.advanced.create_widgets = _advanced_create_widgets; - */ + v = E_NEW(E_Config_Dialog_View, 1); + v->create_cfdata = _create_data; + v->free_cfdata = _free_data; + v->basic.apply_cfdata = _basic_apply_data; + v->basic.create_widgets = _basic_create_widgets; + v->advanced.apply_cfdata = NULL; + v->advanced.create_widgets = NULL; - cfd = e_config_dialog_new(con, _("Mixer Face Configuration"), NULL, 0, &v, face); + cfd = e_config_dialog_new(con, _("Mixer Face Configuration"), NULL, 0, v, face); } @@ -84,6 +79,7 @@ _free_data(E_Config_Dialog* cfd, CFData* cfdata) { Evas_List *l; + for(l = cfdata->mixers; l; l = evas_list_next(l)) { Mixer_CFData* d; @@ -149,18 +145,3 @@ return 1; } - - -static Evas_Object -*_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) - -{ - return NULL; -} - -static int -_advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata) -{ - return 1; -} - ------------------------------------------------------- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642 _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs