From: Enlightenment C. <no...@cv...> - 2006-04-05 17:49:47
|
Enlightenment CVS committal Author : mej Project : e_modules Module : evolume Dir : e_modules/evolume/src/module Modified Files: e_mod_cdialog.c e_mod_cdialog.h e_mod_cmdialog.c e_mod_cmdialog.h e_mod_config.c e_mod_config.h e_mod_face.c e_mod_face.h e_mod_main.c e_mod_main.h e_mod_menu.c e_mod_menu.h e_mod_mixer.c e_mod_mixer.h e_mod_pack.c e_mod_pack.h e_mod_slider.c e_mod_slider.h e_mod_util.c e_mod_util.h e_mod_volume.c e_mod_volume.h Log Message: Wed Apr 5 13:48:36 2006 Michael Jennings (mej) Indent! ---------------------------------------------------------------------- =================================================================== RCS file: /cvs/e/e_modules/evolume/src/module/e_mod_cdialog.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- e_mod_cdialog.c 28 Mar 2006 20:30:39 -0000 1.2 +++ e_mod_cdialog.c 5 Apr 2006 17:48:48 -0000 1.3 @@ -6,19 +6,18 @@ #include <e_mod_cmdialog.h> #include <e.h> - typedef struct _cfdata CFData; typedef struct _mixerdata Mixer_CFData; struct _cfdata { - Evas_List* mixers; + Evas_List *mixers; }; struct _mixerdata { - Config_Mixer* mixer; - int active; + Config_Mixer *mixer; + int active; }; /* Protos */ @@ -27,121 +26,125 @@ 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); -void e_volume_config_module(E_Container* con, Volume_Face *face) +void +e_volume_config_module(E_Container *con, Volume_Face *face) { - E_Config_Dialog* cfd; - E_Config_Dialog_View *v; + E_Config_Dialog *cfd; + E_Config_Dialog_View *v; - 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; + v = E_NEW(E_Config_Dialog_View, 1); - cfd = e_config_dialog_new(con, _("Mixer Face Configuration"), NULL, 0, v, face); -} + 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); +} -static void -_fill_data(Volume_Face* face, CFData* cfdata) +static void +_fill_data(Volume_Face *face, CFData *cfdata) { - Evas_List *l, *l1; - Config_Mixer_System* system_conf; - cfdata->mixers = NULL; - for(l = face->conf->systems; l; l = evas_list_next(l)) - { - system_conf = evas_list_data(l); - for(l1 = system_conf->mixers; l1; l1 = evas_list_next(l1)) - { - Mixer_CFData* mcfd; - - mcfd = calloc(1, sizeof(Mixer_CFData)); - mcfd->mixer = evas_list_data(l1); - fprintf(stderr,"mcfd->mixer->real = %s\n", mcfd->mixer->real); - mcfd->active = mcfd->mixer->active; - cfdata->mixers = evas_list_append(cfdata->mixers, mcfd); - } - } + Evas_List *l, *l1; + Config_Mixer_System *system_conf; + + cfdata->mixers = NULL; + for (l = face->conf->systems; l; l = evas_list_next(l)) + { + system_conf = evas_list_data(l); + for (l1 = system_conf->mixers; l1; l1 = evas_list_next(l1)) + { + Mixer_CFData *mcfd; + + mcfd = calloc(1, sizeof(Mixer_CFData)); + mcfd->mixer = evas_list_data(l1); + fprintf(stderr, "mcfd->mixer->real = %s\n", mcfd->mixer->real); + mcfd->active = mcfd->mixer->active; + cfdata->mixers = evas_list_append(cfdata->mixers, mcfd); + } + } } -static void -*_create_data(E_Config_Dialog *cfd) +static void * +_create_data(E_Config_Dialog *cfd) { - CFData *cfdata; + CFData *cfdata; + + cfdata = E_NEW(CFData, 1); - cfdata = E_NEW(CFData, 1); - return cfdata; + return cfdata; } -static void -_free_data(E_Config_Dialog* cfd, CFData* cfdata) +static void +_free_data(E_Config_Dialog *cfd, CFData *cfdata) { - Evas_List *l; + Evas_List *l; - for(l = cfdata->mixers; l; l = evas_list_next(l)) - { - Mixer_CFData* d; - d = evas_list_data(l); - free(d); - } - evas_list_free(cfdata->mixers); + for (l = cfdata->mixers; l; l = evas_list_next(l)) + { + Mixer_CFData *d; - free(cfdata); + d = evas_list_data(l); + free(d); + } + evas_list_free(cfdata->mixers); + + free(cfdata); } -static Evas_Object -*_basic_create_widgets(E_Config_Dialog* cfd, Evas *evas, CFData *cfdata) +static Evas_Object * +_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) { - Evas_Object *o, *of, *ob, *obut; - int i; - Evas_List *l; - Volume_Face* face; - - face = cfd->data; - _fill_data(face, cfdata); - o = e_widget_list_add(evas, 0, 0); - of = e_widget_framelist_add(evas, D_("Mixers"), 0); - for(l = cfdata->mixers, i = 0; l; l = evas_list_next(l), i++) - { - Evas_Object *ob, *obut, *ot; - Mixer_CFData* mcfd; - mcfd = evas_list_data(l); - ot = e_widget_table_add(evas, 0); - - ob = e_widget_check_add(evas, mcfd->mixer->real, &(mcfd->active)); - obut = e_widget_button_add(evas, D_("Configure"), - NULL, e_volume_config_mixer, face, mcfd->mixer); - - e_widget_table_object_append(ot, ob, 1, i, 1, 1, 1, 1, 1, 1); - e_widget_table_object_append(ot, obut, 2, i, 1, 1, 1, 1, 1, 1); - - e_widget_list_object_append(o, ot, 1, 1, 0.5); - } - + Evas_Object *o, *of, *ob, *obut; + int i; + Evas_List *l; + Volume_Face *face; + + face = cfd->data; + _fill_data(face, cfdata); + o = e_widget_list_add(evas, 0, 0); + of = e_widget_framelist_add(evas, D_("Mixers"), 0); + for (l = cfdata->mixers, i = 0; l; l = evas_list_next(l), i++) + { + Evas_Object *ob, *obut, *ot; + Mixer_CFData *mcfd; + + mcfd = evas_list_data(l); + ot = e_widget_table_add(evas, 0); + + ob = e_widget_check_add(evas, mcfd->mixer->real, &(mcfd->active)); + obut = e_widget_button_add(evas, D_("Configure"), NULL, e_volume_config_mixer, face, mcfd->mixer); + + e_widget_table_object_append(ot, ob, 1, i, 1, 1, 1, 1, 1, 1); + e_widget_table_object_append(ot, obut, 2, i, 1, 1, 1, 1, 1, 1); - return o; + e_widget_list_object_append(o, ot, 1, 1, 0.5); + } + + return o; } static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata) { - Evas_List* l; - Volume_Face *face; + Evas_List *l; + Volume_Face *face; + + face = cfd->data; - face = cfd->data; + for (l = cfdata->mixers; l; l = evas_list_next(l)) + { + Mixer_CFData *mcfd; + + mcfd = evas_list_data(l); + if (mcfd->active != mcfd->mixer->active) + { + mcfd->mixer->active = mcfd->active; + e_volume_face_mixer_update(face, mcfd->mixer); + } + } - for(l = cfdata->mixers; l; l = evas_list_next(l)) - { - Mixer_CFData* mcfd; - mcfd = evas_list_data(l); - if(mcfd->active != mcfd->mixer->active) - { - mcfd->mixer->active = mcfd->active; - e_volume_face_mixer_update(face, mcfd->mixer); - } - } - - return 1; + return 1; } =================================================================== RCS file: /cvs/e/e_modules/evolume/src/module/e_mod_cdialog.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_mod_cdialog.h 21 Mar 2006 02:12:20 -0000 1.1 +++ e_mod_cdialog.h 5 Apr 2006 17:48:48 -0000 1.2 @@ -2,7 +2,6 @@ #ifndef E_MOD_CDIALOG_H_INCLUDED #define E_MOD_CDIALOG_H_INCLUDED +void e_volume_config_module(E_Container *con, Volume_Face *face); -void e_volume_config_module(E_Container* con, Volume_Face *face); - -#endif// E_MOD_CDIALOG_H_INCLUDED +#endif // E_MOD_CDIALOG_H_INCLUDED =================================================================== RCS file: /cvs/e/e_modules/evolume/src/module/e_mod_cmdialog.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- e_mod_cmdialog.c 28 Mar 2006 20:30:39 -0000 1.2 +++ e_mod_cmdialog.c 5 Apr 2006 17:48:48 -0000 1.3 @@ -5,27 +5,26 @@ #include <e_mod_cdialog.h> #include <e.h> - typedef struct _cfdata CFData; typedef struct _elemdata Elem_CFData; struct _cfdata { - Evas_List* elems; - Config_Mixer* mixer_conf; + Evas_List *elems; + Config_Mixer *mixer_conf; }; struct _elemdata { - Config_Mixer_Elem* elem; - int active; - int balance; + Config_Mixer_Elem *elem; + int active; + int balance; }; struct _cfg { - Volume_Face* face; - Config_Mixer *mixer_conf; + Volume_Face *face; + Config_Mixer *mixer_conf; }; static void *_create_data(E_Config_Dialog *cfd); @@ -33,135 +32,139 @@ 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); -void e_volume_config_mixer(void *data, void *data2) +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; - struct _cfg *c; - - 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); + Volume_Face *face; + Config_Mixer *mixer_conf; + E_Config_Dialog *cfd; + E_Config_Dialog_View *v; + struct _cfg *c; + + 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); } - -static void -_fill_data(Config_Mixer* mixer_conf, CFData* cfdata) +static void +_fill_data(Config_Mixer *mixer_conf, CFData *cfdata) { - Evas_List *l, *l1; - cfdata->elems = NULL; - cfdata->mixer_conf = mixer_conf; - for(l = mixer_conf->elems; l; l = evas_list_next(l)) - { - Elem_CFData* ecfd; - - ecfd = calloc(1, sizeof(Elem_CFData)); - ecfd->elem = evas_list_data(l); - ecfd->active = ecfd->elem->active; - ecfd->balance = ecfd->elem->balance; - cfdata->elems = evas_list_append(cfdata->elems, ecfd); - } + Evas_List *l, *l1; + + cfdata->elems = NULL; + cfdata->mixer_conf = mixer_conf; + for (l = mixer_conf->elems; l; l = evas_list_next(l)) + { + Elem_CFData *ecfd; + + ecfd = calloc(1, sizeof(Elem_CFData)); + ecfd->elem = evas_list_data(l); + ecfd->active = ecfd->elem->active; + ecfd->balance = ecfd->elem->balance; + cfdata->elems = evas_list_append(cfdata->elems, ecfd); + } } -static void -*_create_data(E_Config_Dialog *cfd) +static void * +_create_data(E_Config_Dialog *cfd) { - CFData *cfdata; + CFData *cfdata; - cfdata = E_NEW(CFData, 1); - return cfdata; + cfdata = E_NEW(CFData, 1); + + return cfdata; } -static void -_free_data(E_Config_Dialog* cfd, CFData* cfdata) +static void +_free_data(E_Config_Dialog *cfd, CFData *cfdata) { - Evas_List *l; + Evas_List *l; - for(l = cfdata->elems; l; l = evas_list_next(l)) - { - Elem_CFData* d; - d = evas_list_data(l); - free(d); - } - evas_list_free(cfdata->elems); + for (l = cfdata->elems; l; l = evas_list_next(l)) + { + Elem_CFData *d; + + d = evas_list_data(l); + free(d); + } + evas_list_free(cfdata->elems); - free(cfdata); - free(cfd->data); + free(cfdata); + free(cfd->data); } -static Evas_Object -*_basic_create_widgets(E_Config_Dialog* cfd, Evas *evas, CFData *cfdata) +static Evas_Object * +_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) { - Evas_Object *o, *of, *ob; - int i; - Evas_List *l; - Config_Mixer* mixer_conf; - struct _cfg* c; - - c = cfd->data; - mixer_conf = c->mixer_conf; - - _fill_data(mixer_conf, cfdata); - - 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 = l->next, i++) - { - Evas_Object *olabel, *oact, *obal, *ot; - Elem_CFData* ecfd; - ecfd = l->data; - - ot = e_widget_table_add(evas, 0); - - olabel = e_widget_label_add(evas, ecfd->elem->name); - oact = e_widget_check_add(evas, D_("Active") ,&(ecfd->active)); - obal = e_widget_check_add(evas, D_("Balance"), &(ecfd->balance)); - - e_widget_table_object_append(ot, olabel, 1, i, 1, 1, 1, 1, 1, 1); - e_widget_table_object_append(ot, oact, 2, i, 1, 1, 0, 1, 1, 1); - e_widget_table_object_append(ot, obal, 3, i, 1, 1, 0, 1, 1, 1); - - e_widget_list_object_append(o, ot, 1, 1, 0.5); - } - + Evas_Object *o, *of, *ob; + int i; + Evas_List *l; + Config_Mixer *mixer_conf; + struct _cfg *c; + + c = cfd->data; + mixer_conf = c->mixer_conf; + + _fill_data(mixer_conf, cfdata); + + 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 = l->next, i++) + { + Evas_Object *olabel, *oact, *obal, *ot; + Elem_CFData *ecfd; + + ecfd = l->data; + + ot = e_widget_table_add(evas, 0); + + olabel = e_widget_label_add(evas, ecfd->elem->name); + oact = e_widget_check_add(evas, D_("Active"), &(ecfd->active)); + obal = e_widget_check_add(evas, D_("Balance"), &(ecfd->balance)); + + e_widget_table_object_append(ot, olabel, 1, i, 1, 1, 1, 1, 1, 1); + e_widget_table_object_append(ot, oact, 2, i, 1, 1, 0, 1, 1, 1); + e_widget_table_object_append(ot, obal, 3, i, 1, 1, 0, 1, 1, 1); + + e_widget_list_object_append(o, ot, 1, 1, 0.5); + } - return o; + return o; } static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata) { - Evas_List *l; - struct _cfg* c; - int u; - - c = cfd->data; - for(l = cfdata->elems; l; l = evas_list_next(l)) - { - Elem_CFData* ecfd; - u = 0; - ecfd = evas_list_data(l); - if( ecfd->active != ecfd->elem->active || - ecfd->balance != ecfd->elem->balance ) - { - ecfd->elem->active = ecfd->active; - ecfd->elem->balance = ecfd->balance; - e_volume_face_mixer_elem_update(c->face, ecfd->elem, cfdata->mixer_conf); - } - } - return 1; + Evas_List *l; + struct _cfg *c; + int u; + + c = cfd->data; + for (l = cfdata->elems; l; l = evas_list_next(l)) + { + Elem_CFData *ecfd; + + u = 0; + ecfd = evas_list_data(l); + if (ecfd->active != ecfd->elem->active || ecfd->balance != ecfd->elem->balance) + { + ecfd->elem->active = ecfd->active; + ecfd->elem->balance = ecfd->balance; + e_volume_face_mixer_elem_update(c->face, ecfd->elem, cfdata->mixer_conf); + } + } + return 1; } =================================================================== RCS file: /cvs/e/e_modules/evolume/src/module/e_mod_cmdialog.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- e_mod_cmdialog.h 28 Mar 2006 20:30:39 -0000 1.2 +++ e_mod_cmdialog.h 5 Apr 2006 17:48:48 -0000 1.3 @@ -3,4 +3,4 @@ void e_volume_config_mixer(void *data, void *data2); -#endif// E_MOD_CMDIALOG_H_INCLUDED +#endif // E_MOD_CMDIALOG_H_INCLUDED =================================================================== RCS file: /cvs/e/e_modules/evolume/src/module/e_mod_config.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_mod_config.c 21 Mar 2006 02:12:20 -0000 1.1 +++ e_mod_config.c 5 Apr 2006 17:48:48 -0000 1.2 @@ -4,7 +4,7 @@ #include <e_mod_util.h> #include <e_mod_main.h> -E_Config_DD *conf_edd; +E_Config_DD *conf_edd; static E_Config_DD *conf_container_edd; static E_Config_DD *conf_face_edd; static E_Config_DD *conf_mixer_system_edd; @@ -12,267 +12,268 @@ static E_Config_DD *conf_elem_edd; /* This will copy only list, not data */ -Evas_List *_evas_list_copy(Evas_List* src) +Evas_List * +_evas_list_copy(Evas_List *src) { - Evas_List *l, *ret; + Evas_List *l, *ret; - if(!src) - return NULL; + if (!src) + return NULL; - ret = NULL; + ret = NULL; - for(l = src; l; l = evas_list_next(l)) - ret = evas_list_append(ret, evas_list_data(l)); + for (l = src; l; l = evas_list_next(l)) + ret = evas_list_append(ret, evas_list_data(l)); - return ret; + return ret; } - -void e_volume_config_init() +void +e_volume_config_init() { -// DBG(stderr,"in start of : %s\n", __FUNCTION__); - conf_elem_edd = E_CONFIG_DD_NEW("Volume_Config_Elem", - Config_Mixer_Elem); +// DBG(stderr,"in start of : %s\n", __FUNCTION__); + conf_elem_edd = E_CONFIG_DD_NEW("Volume_Config_Elem", Config_Mixer_Elem); + #undef T #undef D #define T Config_Mixer_Elem #define D conf_elem_edd - E_CONFIG_VAL(D, T, name, STR); - E_CONFIG_VAL(D, T, elem_id, INT); - E_CONFIG_VAL(D, T, active, INT); - E_CONFIG_VAL(D, T, balance, INT); - E_CONFIG_VAL(D, T, weight, INT); + E_CONFIG_VAL(D, T, name, STR); + E_CONFIG_VAL(D, T, elem_id, INT); + E_CONFIG_VAL(D, T, active, INT); + E_CONFIG_VAL(D, T, balance, INT); + E_CONFIG_VAL(D, T, weight, INT); + conf_mixer_edd = E_CONFIG_DD_NEW("Volume_Config_Mixer", Config_Mixer); - conf_mixer_edd = E_CONFIG_DD_NEW("Volume_Config_Mixer", Config_Mixer); #undef T #undef D #define T Config_Mixer #define D conf_mixer_edd - E_CONFIG_VAL(D, T, real, STR); - E_CONFIG_VAL(D, T, card, STR); - E_CONFIG_VAL(D, T, system, STR); - E_CONFIG_VAL(D, T, active, INT); - E_CONFIG_VAL(D, T, mixer_id, INT); - E_CONFIG_LIST(D, T, elems, conf_elem_edd); + E_CONFIG_VAL(D, T, real, STR); + E_CONFIG_VAL(D, T, card, STR); + E_CONFIG_VAL(D, T, system, STR); + E_CONFIG_VAL(D, T, active, INT); + E_CONFIG_VAL(D, T, mixer_id, INT); + E_CONFIG_LIST(D, T, elems, conf_elem_edd); - - conf_mixer_system_edd = E_CONFIG_DD_NEW("Volume_Config_Mixer_System", - Config_Mixer_System); + conf_mixer_system_edd = E_CONFIG_DD_NEW("Volume_Config_Mixer_System", Config_Mixer_System); #undef T #undef D #define T Config_Mixer_System #define D conf_mixer_system_edd - E_CONFIG_VAL(D, T, name, STR); - E_CONFIG_VAL(D, T, system, STR); - E_CONFIG_VAL(D, T, active, INT); - E_CONFIG_VAL(D, T, system_id, INT); - E_CONFIG_LIST(D, T, mixers, conf_mixer_edd); - - conf_face_edd = E_CONFIG_DD_NEW("Volume_Config_Face", Config_Face); + E_CONFIG_VAL(D, T, name, STR); + E_CONFIG_VAL(D, T, system, STR); + E_CONFIG_VAL(D, T, active, INT); + E_CONFIG_VAL(D, T, system_id, INT); + E_CONFIG_LIST(D, T, mixers, conf_mixer_edd); + + conf_face_edd = E_CONFIG_DD_NEW("Volume_Config_Face", Config_Face); + #undef T #undef D #define T Config_Face #define D conf_face_edd - E_CONFIG_LIST(D, T, systems, conf_mixer_system_edd); - E_CONFIG_VAL(D, T, orient, INT); + E_CONFIG_LIST(D, T, systems, conf_mixer_system_edd); + E_CONFIG_VAL(D, T, orient, INT); - conf_container_edd = E_CONFIG_DD_NEW("Volume_Config_Container", - Config_Container); + conf_container_edd = E_CONFIG_DD_NEW("Volume_Config_Container", Config_Container); #undef T #undef D #define T Config_Container #define D conf_container_edd - E_CONFIG_LIST(D, T, faces, conf_face_edd); + E_CONFIG_LIST(D, T, faces, conf_face_edd); + + conf_edd = E_CONFIG_DD_NEW("Volume_Config", Config); - conf_edd = E_CONFIG_DD_NEW("Volume_Config", Config); #undef T #undef D #define T Config #define D conf_edd - E_CONFIG_LIST(D, T, containers, conf_container_edd); + E_CONFIG_LIST(D, T, containers, conf_container_edd); -// DBG(stderr,"conf_edd = %p\n", conf_edd); +// DBG(stderr,"conf_edd = %p\n", conf_edd); -// DBG(stderr,"in end of : %s\n", __FUNCTION__); - return; +// DBG(stderr,"in end of : %s\n", __FUNCTION__); + return; } -Config_Mixer_System* e_volume_config_mixer_system_get( - Mixer_System_Name* msn, Config_Face* conf) +Config_Mixer_System * +e_volume_config_mixer_system_get(Mixer_System_Name *msn, Config_Face *conf) { - Evas_List *l; - for(l = conf->systems; l; l = evas_list_next(l)) - { - Config_Mixer_System* cms; - cms = evas_list_data(l); + Evas_List *l; + + for (l = conf->systems; l; l = evas_list_next(l)) + { + Config_Mixer_System *cms; + + cms = evas_list_data(l); #if 0 - DBG(stderr,"cms->name = %s, cms->system = %s\n", cms->name, - cms->system); - DBG(stderr,"msn->name = %s, msn->system = %s\n", msn->name, - msn->system); + DBG(stderr, "cms->name = %s, cms->system = %s\n", cms->name, cms->system); + DBG(stderr, "msn->name = %s, msn->system = %s\n", msn->name, msn->system); #endif #if 0 - fprintf(stderr,"cms->system_id = %x, msn->system_id = %x\n", - cms->system_id, msn->system_id); + fprintf(stderr, "cms->system_id = %x, msn->system_id = %x\n", cms->system_id, msn->system_id); #endif - if (SYSTEM_ID(cms->system_id) == SYSTEM_ID(msn->system_id)) - return cms; - } - if(!l) - { - Config_Mixer_System* cms; -// DBG(stderr,"Creating new systme: %s\n", msn->name); - - cms = calloc(1, sizeof(Config_Mixer_System)); - cms->name = evas_stringshare_add(msn->name); - cms->system = evas_stringshare_add(msn->system); - cms->active = 1; - cms->system_id = msn->system_id; - cms->mixers = NULL; + if (SYSTEM_ID(cms->system_id) == SYSTEM_ID(msn->system_id)) + return cms; + } + if (!l) + { + Config_Mixer_System *cms; + +// DBG(stderr,"Creating new systme: %s\n", msn->name); + + cms = calloc(1, sizeof(Config_Mixer_System)); + cms->name = evas_stringshare_add(msn->name); + cms->system = evas_stringshare_add(msn->system); + cms->active = 1; + cms->system_id = msn->system_id; + cms->mixers = NULL; - conf->systems = evas_list_append(conf->systems, cms); + conf->systems = evas_list_append(conf->systems, cms); - return cms; - } + return cms; + } - return NULL; + return NULL; } -Config_Mixer* e_volume_config_mixer_get(Mixer_Name* mixer_name, Config_Face* conf) +Config_Mixer * +e_volume_config_mixer_get(Mixer_Name *mixer_name, Config_Face *conf) { - Evas_List *l; + Evas_List *l; - Config_Mixer_System* cms; - cms = e_volume_config_mixer_system_get(mixer_name->system_name, conf); + Config_Mixer_System *cms; - for( l = cms->mixers; l; l = evas_list_next(l)) - { - Config_Mixer* mixer_conf; - mixer_conf = evas_list_data(l); + cms = e_volume_config_mixer_system_get(mixer_name->system_name, conf); + + for (l = cms->mixers; l; l = evas_list_next(l)) + { + Config_Mixer *mixer_conf; + + mixer_conf = evas_list_data(l); #if 0 - fprintf(stderr,"mixer_id1 = %x, mixer_id2 = %x\n", - mixer_conf->mixer_id, mixer_name->mixer_id); + fprintf(stderr, "mixer_id1 = %x, mixer_id2 = %x\n", mixer_conf->mixer_id, mixer_name->mixer_id); #endif - if (MIXER_ID(mixer_conf->mixer_id) == MIXER_ID(mixer_name->mixer_id) ) - { -// DBG(stderr,"using mixer_conf = %p\n", mixer_conf); - return mixer_conf; - } - } - if(!l) - { - /* Ok, create new one */ - Config_Mixer* mixer_conf; - mixer_conf = calloc(1, sizeof(Config_Mixer)); - mixer_conf->real = evas_stringshare_add(mixer_name->real); - mixer_conf->card = evas_stringshare_add(mixer_name->card); - mixer_conf->system = evas_stringshare_add(cms->name); - mixer_conf->mixer_id = mixer_name->mixer_id | cms->system_id; - mixer_conf->active = 1; - mixer_conf->elems = NULL; + if (MIXER_ID(mixer_conf->mixer_id) == MIXER_ID(mixer_name->mixer_id)) + { +// DBG(stderr,"using mixer_conf = %p\n", mixer_conf); + return mixer_conf; + } + } + if (!l) + { + /* Ok, create new one */ + Config_Mixer *mixer_conf; + + mixer_conf = calloc(1, sizeof(Config_Mixer)); + mixer_conf->real = evas_stringshare_add(mixer_name->real); + mixer_conf->card = evas_stringshare_add(mixer_name->card); + mixer_conf->system = evas_stringshare_add(cms->name); + mixer_conf->mixer_id = mixer_name->mixer_id | cms->system_id; + mixer_conf->active = 1; + mixer_conf->elems = NULL; -// DBG(stderr,"Creating new mixer_conf\n"); - cms->mixers = evas_list_append(cms->mixers, mixer_conf); +// DBG(stderr,"Creating new mixer_conf\n"); + cms->mixers = evas_list_append(cms->mixers, mixer_conf); - return mixer_conf; - } + return mixer_conf; + } - return NULL; + return NULL; } -Config_Mixer_Elem* e_volume_config_melem_get(Mixer_Elem* melem, Config_Face* conf) +Config_Mixer_Elem * +e_volume_config_melem_get(Mixer_Elem *melem, Config_Face *conf) { - Config_Mixer* mixer_conf; - Config_Mixer_Elem *elem; - Evas_List *l; - int hash; - char fullname[1024]; - - - // DBG( stderr, "fullname = %s\n", fullname); - - mixer_conf = e_volume_config_mixer_get(melem->mixer->name, conf); - - /* - DBG(stderr,"mixer_conf->name = %s, mixer->name = %s\n", - mixer_conf->name, melem->mixer->name); - */ - - for(l = mixer_conf->elems; l; l = evas_list_next(l)) - { - elem = evas_list_data(l); + Config_Mixer *mixer_conf; + Config_Mixer_Elem *elem; + Evas_List *l; + int hash; + char fullname[1024]; + + // DBG( stderr, "fullname = %s\n", fullname); + + mixer_conf = e_volume_config_mixer_get(melem->mixer->name, conf); + + /* + * DBG(stderr,"mixer_conf->name = %s, mixer->name = %s\n", + * mixer_conf->name, melem->mixer->name); + */ + + for (l = mixer_conf->elems; l; l = evas_list_next(l)) + { + elem = evas_list_data(l); #if 0 - DBG(stderr, "elem->hash = %d, hash = %d, elem->name = %s\n", - elem->hash, hash, elem->name); + DBG(stderr, "elem->hash = %d, hash = %d, elem->name = %s\n", elem->hash, hash, elem->name); #endif #if 0 - fprintf(stderr,"elem->elem_id = %x, elem->elem_id = %x\n", - ELEM_ID(elem->elem_id), elem->elem_id); + fprintf(stderr, "elem->elem_id = %x, elem->elem_id = %x\n", ELEM_ID(elem->elem_id), elem->elem_id); #endif - if(ELEM_ID(elem->elem_id) == ELEM_ID(melem->elem_id)) - { - fprintf(stderr,"found: %x\n", elem->elem_id); - return elem; - } - } - - /* We lookup all elem entries and don't found */ - /* requested: create one new and return it*/ - if(!l) - { - DBG(stderr, "`elem' is not found\n"); - DBG(stderr, "name = %s, hash = %d\n", melem->name, hash); - elem = calloc(1, sizeof(Config_Mixer_Elem)); - - elem->name = evas_stringshare_add(melem->name); - elem->active = 1; - elem->weight = (evas_list_count(mixer_conf->elems) + 1) * 10; - elem->elem_id = melem->elem_id | mixer_conf->mixer_id; //GET_ELEM_ID(melem); - - mixer_conf->elems = evas_list_append(mixer_conf->elems, - elem); - - return elem; - } - - DBG(stderr,"MIXER CONFIG NOT CREATED FOR %s->%s->%s\n", - melem->mixer->system->name->system, melem->mixer->name->real, - melem->name); - return NULL; + if (ELEM_ID(elem->elem_id) == ELEM_ID(melem->elem_id)) + { + fprintf(stderr, "found: %x\n", elem->elem_id); + return elem; + } + } + + /* We lookup all elem entries and don't found */ + /* requested: create one new and return it */ + if (!l) + { + DBG(stderr, "`elem' is not found\n"); + DBG(stderr, "name = %s, hash = %d\n", melem->name, hash); + elem = calloc(1, sizeof(Config_Mixer_Elem)); + + elem->name = evas_stringshare_add(melem->name); + elem->active = 1; + elem->weight = (evas_list_count(mixer_conf->elems) + 1) * 10; + elem->elem_id = melem->elem_id | mixer_conf->mixer_id; //GET_ELEM_ID(melem); + + mixer_conf->elems = evas_list_append(mixer_conf->elems, elem); + + return elem; + } + + DBG(stderr, "MIXER CONFIG NOT CREATED FOR %s->%s->%s\n", + melem->mixer->system->name->system, melem->mixer->name->real, melem->name); + return NULL; } -Config* e_volume_config_load() +Config * +e_volume_config_load() { - Config* conf; -// DBG(stderr,"in start of : %s\n", __FUNCTION__); - conf = e_config_domain_load("module.evolume", conf_edd); - - if(!conf) - { - conf = calloc(1, sizeof(Config)); - conf->containers = NULL; - } - if(!conf->containers) - e_volume_first_run(); + Config *conf; + +// DBG(stderr,"in start of : %s\n", __FUNCTION__); + conf = e_config_domain_load("module.evolume", conf_edd); + if (!conf) + { + conf = calloc(1, sizeof(Config)); + conf->containers = NULL; + } + if (!conf->containers) + e_volume_first_run(); -// DBG(stderr,"in end of : %s\n", __FUNCTION__); - return conf; +// DBG(stderr,"in end of : %s\n", __FUNCTION__); + return conf; } -void e_volume_config_shutdown() +void +e_volume_config_shutdown() { -// DBG(stderr,"in start of : %s\n", __FUNCTION__); - E_CONFIG_DD_FREE(conf_edd); - E_CONFIG_DD_FREE(conf_container_edd); - E_CONFIG_DD_FREE(conf_face_edd); - E_CONFIG_DD_FREE(conf_mixer_edd); - E_CONFIG_DD_FREE(conf_elem_edd); -// DBG(stderr,"in end of : %s\n", __FUNCTION__); +// DBG(stderr,"in start of : %s\n", __FUNCTION__); + E_CONFIG_DD_FREE(conf_edd); + E_CONFIG_DD_FREE(conf_container_edd); + E_CONFIG_DD_FREE(conf_face_edd); + E_CONFIG_DD_FREE(conf_mixer_edd); + E_CONFIG_DD_FREE(conf_elem_edd); +// DBG(stderr,"in end of : %s\n", __FUNCTION__); } =================================================================== RCS file: /cvs/e/e_modules/evolume/src/module/e_mod_config.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_mod_config.h 21 Mar 2006 02:12:20 -0000 1.1 +++ e_mod_config.h 5 Apr 2006 17:48:48 -0000 1.2 @@ -2,7 +2,6 @@ #ifndef E_MOD_CONFIG_H_INCLUDED #define E_MOD_CONFIG_H_INCLUDED - #include "e_mod_volume.h" #define ORIENT_VERT 0x01 @@ -13,78 +12,75 @@ extern E_Config_DD *conf_edd; - struct _Config_Mixer_Elem { - char *name; - int active; - int balance; - int weight; + char *name; + int active; + int balance; + int weight; - int elem_id; + int elem_id; }; -struct _Config_Mixer +struct _Config_Mixer { - /* Nice name of mixer */ - char *real; + /* Nice name of mixer */ + char *real; - /* Card (e.g. local) name of mixer */ - char *card; + /* Card (e.g. local) name of mixer */ + char *card; - /* Name of mixer system, this is to avoid back referencing */ - char *system; - /* If mixer is active */ - int active; - /* List of Config_Mixer_Elem */ - Evas_List *elems; + /* Name of mixer system, this is to avoid back referencing */ + char *system; + /* If mixer is active */ + int active; + /* List of Config_Mixer_Elem */ + Evas_List *elems; - /* Mixer id */ - int mixer_id; + /* Mixer id */ + int mixer_id; - /* Oh, this is not criminal ? */ -// Config_Mixer_System *mixer_system; + /* Oh, this is not criminal ? */ +// Config_Mixer_System *mixer_system; }; struct _Config_Mixer_System { - /* Real name of Mixer System */ - char *name; - /* System name of mixer system (used to match soname) */ - char *system; - /* Mixers by this System */ - Evas_List *mixers; - /* If this mixer system is active */ - int active; - /* System id*/ - int system_id; + /* Real name of Mixer System */ + char *name; + /* System name of mixer system (used to match soname) */ + char *system; + /* Mixers by this System */ + Evas_List *mixers; + /* If this mixer system is active */ + int active; + /* System id */ + int system_id; }; struct _Config_Face { - int orient; - Evas_List* systems; + int orient; + Evas_List *systems; }; struct _Config_Container { - Evas_List* faces; + Evas_List *faces; }; struct _Config { - Evas_List* containers; + Evas_List *containers; }; - void e_volume_config_init(); void e_volume_config_shutdown(); -Config* e_volume_config_load(); -Config_Mixer_Elem* e_volume_config_melem_get(Mixer_Elem* melem, Config_Face* conf); -Config_Mixer* e_volume_config_mixer_get(Mixer_Name* melem, Config_Face* conf); -Config_Mixer_System* e_volume_config_mixer_system_get( - Mixer_System_Name* msn, Config_Face* conf); +Config *e_volume_config_load(); +Config_Mixer_Elem *e_volume_config_melem_get(Mixer_Elem *melem, Config_Face *conf); +Config_Mixer *e_volume_config_mixer_get(Mixer_Name *melem, Config_Face *conf); +Config_Mixer_System *e_volume_config_mixer_system_get(Mixer_System_Name *msn, Config_Face *conf); #define SYSTEM_ID(a) ((a) & 0x00FF0000) #define MIXER_ID(a) ((a) & 0x0000FF00) =================================================================== RCS file: /cvs/e/e_modules/evolume/src/module/e_mod_face.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_mod_face.c 21 Mar 2006 02:12:20 -0000 1.1 +++ e_mod_face.c 5 Apr 2006 17:48:48 -0000 1.2 @@ -10,524 +10,510 @@ static int _volume_count = 0; - -static void _volume_face_cb_gmc_change(void *data, E_Gadman_Client* gmc __UNUSED__, - E_Gadman_Change change) +static void +_volume_face_cb_gmc_change(void *data, E_Gadman_Client *gmc __UNUSED__, E_Gadman_Change change) { - Volume_Face* face; - int x, y, w, h; - + Volume_Face *face; + int x, y, w, h; - face = data; - switch (change) - { - case E_GADMAN_CHANGE_MOVE_RESIZE: - e_gadman_client_geometry_get(face->gmc, &x, &y, &w, &h); - evas_object_move(face->main_object, x, y); - evas_object_resize(face->main_object, w, h); + face = data; + switch (change) + { + case E_GADMAN_CHANGE_MOVE_RESIZE: + e_gadman_client_geometry_get(face->gmc, &x, &y, &w, &h); + evas_object_move(face->main_object, x, y); + evas_object_resize(face->main_object, w, h); #if 0 - evas_object_geometry_get(face->table_object, &x, &y, &w, &h); - DBG(stderr,"x = %d, y = %d, w = %d, h = %d\n", - x,y,w,h); + evas_object_geometry_get(face->table_object, &x, &y, &w, &h); + DBG(stderr, "x = %d, y = %d, w = %d, h = %d\n", x, y, w, h); #endif - break; - default: - break; - } + break; + default: + break; + } } #define MOVE_EXCHANGE 0 #define MOVE_MOVE 1 -static Mixer_Slider* src_slider; +static Mixer_Slider *src_slider; static int m_action; -static Mixer_Slider* _get_mixer_slider_under_pointer(int x, int y, - Volume_Face* face) +static Mixer_Slider * +_get_mixer_slider_under_pointer(int x, int y, Volume_Face *face) { - Evas_List *l; - Mixer_Slider *slider; + Evas_List *l; + Mixer_Slider *slider; - for(l = face->sliders; l; l = evas_list_next(l)) - { - int px, py, pw, ph; - slider = evas_list_data(l); - evas_object_geometry_get(slider->name, &px, &py, &pw, &ph); - /* - DBG(stderr,"px = %d, py = %d, pw = %d, ph = %d\n", - px, py, pw, ph); - */ - if ((x > px && x < px + pw) && - (y > py && y < py + ph)) - return slider; - } + for (l = face->sliders; l; l = evas_list_next(l)) + { + int px, py, pw, ph; + + slider = evas_list_data(l); + evas_object_geometry_get(slider->name, &px, &py, &pw, &ph); + /* + * DBG(stderr,"px = %d, py = %d, pw = %d, ph = %d\n", + * px, py, pw, ph); + */ + if ((x > px && x < px + pw) && (y > py && y < py + ph)) + return slider; + } - return NULL; + return NULL; } - -static void _volume_face_cb_mouse_down(void *data, Evas* e __UNUSED__, - Evas_Object* obj __UNUSED__, void* event_info) +static void +_volume_face_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) { - Volume_Face* face; - Evas_Event_Mouse_Down* ev; + Volume_Face *face; + Evas_Event_Mouse_Down *ev; - face = data; - ev = event_info; - if (ev->button == 3) - { - if(src_slider == NULL) - { - e_menu_activate_mouse(face->menu, e_zone_current_get(face->con), - ev->output.x, ev->output.y, 1, 1, E_MENU_POP_DIRECTION_AUTO, - ev->timestamp); - e_util_container_fake_mouse_up_all_later(face->con); - } - else - { - src_slider->conf->active = 0; - e_volume_pack_unpack(face, src_slider); - e_volume_slider_free(src_slider, 1); - src_slider=NULL; - e_config_save_queue(); - } - } - if (ev->button == 2) - { - Evas_List *l; - Mixer_Slider *slider; - Mixer_Elem *melem; - - for (l = face->sliders; l; l = evas_list_next(l)) - { - slider = evas_list_data(l); - - melem = slider->melem; - if (melem) - { - int mute; - char buf[32]; - - mute = mixer_get_mute(melem); - mixer_set_mute(melem, !mute); - snprintf(buf, 32, "mute,set,%d", mute); - edje_object_signal_emit(slider->drag_volume, buf, "evolume_bin"); - } - } - - e_volume_face_mixers_update(face); - } - if(ev->button == 1) - { - Mixer_Slider *slider; - /* Try to get slider */ - slider = _get_mixer_slider_under_pointer(ev->output.x, - ev->output.y, face); - - if(slider == NULL) - return; - - if(src_slider == NULL) - src_slider = slider; - else if(m_action == MOVE_EXCHANGE) - { - - if(src_slider == slider) - { - /* Cancel moving */ - src_slider = NULL; - edje_object_signal_emit(slider->name, "choosen,0", "evolume_bin"); - return; - } - - edje_object_signal_emit(src_slider->name, "choosen,0", - "evolume_bin"); - e_volume_pack_swap(face, src_slider, slider); - src_slider = NULL; - e_config_save_queue(); - } + face = data; + ev = event_info; + if (ev->button == 3) + { + if (src_slider == NULL) + { + e_menu_activate_mouse(face->menu, e_zone_current_get(face->con), + ev->output.x, ev->output.y, 1, 1, E_MENU_POP_DIRECTION_AUTO, ev->timestamp); + e_util_container_fake_mouse_up_all_later(face->con); + } + else + { + src_slider->conf->active = 0; + e_volume_pack_unpack(face, src_slider); + e_volume_slider_free(src_slider, 1); + src_slider = NULL; + e_config_save_queue(); + } + } + if (ev->button == 2) + { + Evas_List *l; + Mixer_Slider *slider; + Mixer_Elem *melem; + + for (l = face->sliders; l; l = evas_list_next(l)) + { + slider = evas_list_data(l); + + melem = slider->melem; + if (melem) + { + int mute; + char buf[32]; + + mute = mixer_get_mute(melem); + mixer_set_mute(melem, !mute); + snprintf(buf, 32, "mute,set,%d", mute); + edje_object_signal_emit(slider->drag_volume, buf, "evolume_bin"); + } + } + + e_volume_face_mixers_update(face); + } + if (ev->button == 1) + { + Mixer_Slider *slider; + + /* Try to get slider */ + slider = _get_mixer_slider_under_pointer(ev->output.x, ev->output.y, face); + + if (slider == NULL) + return; + + if (src_slider == NULL) + src_slider = slider; + else if (m_action == MOVE_EXCHANGE) + { + + if (src_slider == slider) + { + /* Cancel moving */ + src_slider = NULL; + edje_object_signal_emit(slider->name, "choosen,0", "evolume_bin"); + return; + } + + edje_object_signal_emit(src_slider->name, "choosen,0", "evolume_bin"); + e_volume_pack_swap(face, src_slider, slider); + src_slider = NULL; + e_config_save_queue(); + } - } + } } - - -static void _volume_face_cb_mouse_up(void *data, Evas* e __UNUSED__, - Evas_Object* obj __UNUSED__, void* event_info) +static void +_volume_face_cb_mouse_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) { - Volume_Face* face; - Evas_Event_Mouse_Down* ev; + Volume_Face *face; + Evas_Event_Mouse_Down *ev; - face = data; - ev = event_info; - if(ev->button == 1) - { - Mixer_Slider *slider; - /* Try to get slider */ - slider = _get_mixer_slider_under_pointer(ev->output.x, - ev->output.y, face); - - if(slider == NULL) - return; - - if(src_slider == slider) - { - edje_object_signal_emit(slider->name, "choosen,1", "evolume_bin"); - m_action = MOVE_EXCHANGE; - } - else if(src_slider != NULL && slider != NULL) - { - /* Move code there */ - src_slider->conf->weight = slider->conf->weight - 1; - /* FIXME: THIS IS SLOW, SHOULD USE REPACK INSTEAD */ -// e_volume_mixers_recreate(face); - src_slider = NULL; - } - } + face = data; + ev = event_info; + if (ev->button == 1) + { + Mixer_Slider *slider; + + /* Try to get slider */ + slider = _get_mixer_slider_under_pointer(ev->output.x, ev->output.y, face); + + if (slider == NULL) + return; + + if (src_slider == slider) + { + edje_object_signal_emit(slider->name, "choosen,1", "evolume_bin"); + m_action = MOVE_EXCHANGE; + } + else if (src_slider != NULL && slider != NULL) + { + /* Move code there */ + src_slider->conf->weight = slider->conf->weight - 1; + /* FIXME: THIS IS SLOW, SHOULD USE REPACK INSTEAD */ +// e_volume_mixers_recreate(face); + src_slider = NULL; + } + } } #ifndef MAX # define MAX(a,b) (a)>(b)?(a):(b) #endif -static int _mixer_update_mixer_slider(Mixer_Slider* slider) +static int +_mixer_update_mixer_slider(Mixer_Slider *slider) { - Mixer_Elem* melem; - int vl, vr; - int vol, pvol; - - if (slider->locked) - return 0; - - melem = slider->melem; - - if(melem) - mixer_get_volume(melem, &vl, &vr); - - vol = MAX(vl, vr); - pvol = MAX(melem->pvl, melem->pvr); - - if (vl != melem->pvl || vr != melem->pvr || slider->first) - { - if (vol != pvol || slider->first) - { - /* Update volume */ - if (slider->orient == ORIENT_HORIZ) - edje_object_part_drag_value_set(slider->drag_volume, - "volume_bar_drag", (float)vol/100.0f, 0); - - if (slider->orient == ORIENT_VERT && !slider->balance) - edje_object_part_drag_value_set(slider->drag_volume, - "volume_bar_drag", 0.5f, - 1.0f - (double)vol/100.0f); - } - + Mixer_Elem *melem; + int vl, vr; + int vol, pvol; + + if (slider->locked) + return 0; + + melem = slider->melem; + + if (melem) + mixer_get_volume(melem, &vl, &vr); + + vol = MAX(vl, vr); + pvol = MAX(melem->pvl, melem->pvr); + + if (vl != melem->pvl || vr != melem->pvr || slider->first) + { + if (vol != pvol || slider->first) + { + /* Update volume */ + if (slider->orient == ORIENT_HORIZ) + edje_object_part_drag_value_set(slider->drag_volume, "volume_bar_drag", (float)vol / 100.0f, 0); + + if (slider->orient == ORIENT_VERT && !slider->balance) + edje_object_part_drag_value_set(slider->drag_volume, "volume_bar_drag", 0.5f, 1.0f - (double)vol / 100.0f); + } + #if 0 - if (vl > melem->pvl || vr > melem->pvr) - if (vol != pvol && (vl > melem->pvl || vr > melem->pvr)) + if (vl > melem->pvl || vr > melem->pvr) + if (vol != pvol && (vl > melem->pvl || vr > melem->pvr)) #endif - /* Now we use locking mechanism and checking is not needed */ - if (slider->drag_balance) - { - double bal; + /* Now we use locking mechanism and checking is not needed */ + if (slider->drag_balance) + { + double bal; - if (vr > vl) - slider->balance = (int) rint(((double) vr / vl) * 100) - 100; - else if (vl > vr) - slider->balance = 100 - (int) rint(((double) vl / vr) * 100); - else - slider->balance = 0; + if (vr > vl) + slider->balance = (int)rint(((double)vr / vl) * 100) - 100; + else if (vl > vr) + slider->balance = 100 - (int)rint(((double)vl / vr) * 100); + else + slider->balance = 0; - bal = ((double)slider->balance/200.0f) + 0.5f; + bal = ((double)slider->balance / 200.0f) + 0.5f; - // DBG(stderr,"balance = %d, bal = %f\n", balance, bal); + // DBG(stderr,"balance = %d, bal = %f\n", balance, bal); - edje_object_part_drag_value_set(slider->drag_balance, - "volume_bar_drag", bal, 1.0f - (double)vol/100.0f); + edje_object_part_drag_value_set(slider->drag_balance, "volume_bar_drag", bal, 1.0f - (double)vol / 100.0f); - } + } - } + } #if 0 /* if (((vl != melem->pvl || vr != melem->pvr) && slider->drag_balance && vol == pvol) || slider->first)*/ - /* - DBG(stderr,"vol = %d, pvol = %d\nvl = %d, pvl = %d\n" - "vr = %d, pvr = %d\n", vol, pvol, vl, melem->pvl, - vr, melem->pvr); - */ - //if ( vol == pvol || slider->first ) + /* + * DBG(stderr,"vol = %d, pvol = %d\nvl = %d, pvl = %d\n" + * "vr = %d, pvr = %d\n", vol, pvol, vl, melem->pvl, + * vr, melem->pvr); + */ + //if ( vol == pvol || slider->first ) /* || vl > melem->pvl || vr > melem->pvr || slider->first) && 1) */ #endif - melem->pvr = vr; - melem->pvl = vl; + melem->pvr = vr; + melem->pvl = vl; - if(slider->first) - slider->first = 0; + if (slider->first) + slider->first = 0; - return 1; + return 1; } - -void e_volume_face_mixers_update(Volume_Face* face) + +void +e_volume_face_mixers_update(Volume_Face *face) { - Evas_List *l; - Mixer_Slider *m; - for(l = face->sliders; l; l = evas_list_next(l)) - { - m = (Mixer_Slider*)evas_list_data(l); - if(m) - _mixer_update_mixer_slider(m); - - //DBG(stderr, "m = %p\n", m); - //DBG(stderr,"mixer = %p\n", evas_object_data_get(m, "mixer")); - } -} + Evas_List *l; + Mixer_Slider *m; + for (l = face->sliders; l; l = evas_list_next(l)) + { + m = (Mixer_Slider *)evas_list_data(l); + if (m) + _mixer_update_mixer_slider(m); + + //DBG(stderr, "m = %p\n", m); + //DBG(stderr,"mixer = %p\n", evas_object_data_get(m, "mixer")); + } +} -void e_volume_face_mixer_update(Volume_Face* face, - Config_Mixer* mixer_conf) +void +e_volume_face_mixer_update(Volume_Face *face, Config_Mixer *mixer_conf) { - Evas_List *l; - Mixer_System_Name* msn; - Mixer_Name* name; - - for(l = face->volume->mixer_system_names; l; l = evas_list_data(l)) - { - msn = evas_list_data(l); - if(SYSTEM_ID(msn->system_id) == SYSTEM_ID(mixer_conf->mixer_id)) - break; - } - - if(!l) - return; - - for(l = msn->mixer_names; l; l = evas_list_next(l)) - { - name = evas_list_data(l); - if(MIXER_ID(name->mixer_id) == MIXER_ID(mixer_conf->mixer_id)) - break; - } - - if(!l || !name) - return; - - - /* Activating mixer */ - if(mixer_conf->active) - { - Mixer* mixer; - mixer = e_volume_mixer_open(face->volume, name); - if(mixer) - { - e_volume_mixers_create(face, mixer, face->con->bg_evas, 1); - e_volume_face_mixers_update(face); - } - } - else - { - Mixer *mixer; - - mixer = e_util_search_mixer_by_name(face->volume->mixers, - name); - - if(mixer) - e_volume_mixers_free(face, mixer, 1); - } + Evas_List *l; + Mixer_System_Name *msn; + Mixer_Name *name; + + for (l = face->volume->mixer_system_names; l; l = evas_list_data(l)) + { + msn = evas_list_data(l); + if (SYSTEM_ID(msn->system_id) == SYSTEM_ID(mixer_conf->mixer_id)) + break; + } + + if (!l) + return; + + for (l = msn->mixer_names; l; l = evas_list_next(l)) + { + name = evas_list_data(l); + if (MIXER_ID(name->mixer_id) == MIXER_ID(mixer_conf->mixer_id)) + break; + } + + if (!l || !name) + return; + + /* Activating mixer */ + if (mixer_conf->active) + { + Mixer *mixer; + + mixer = e_volume_mixer_open(face->volume, name); + if (mixer) + { + e_volume_mixers_create(face, mixer, face->con->bg_evas, 1); + e_volume_face_mixers_update(face); + } + } + else + { + Mixer *mixer; + + mixer = e_util_search_mixer_by_name(face->volume->mixers, name); + + if (mixer) + e_volume_mixers_free(face, mixer, 1); + } } -void e_volume_face_mixer_elem_update(Volume_Face* face, - Config_Mixer_Elem* elem_conf, - Config_Mixer* mixer_conf) +void +e_volume_face_mixer_elem_update(Volume_Face *face, Config_Mixer_Elem *elem_conf, Config_Mixer *mixer_conf) { #if 0 - Mixer_Elem *melem; - Mixer* mixer; + Mixer_Elem *melem; + Mixer *mixer; - Evas_List *l, *l1, *l2; - for(l = face->volume->mixers; l; l = evas_list_next(l)) - { - mixer = evas_list_data(l); - if (MIXER_ID(mixer->name->mixer_id) == MIXER_ID(mixer_conf->mixer_id) && - SYSTEM_ID(mixer->name->mixer_id) == SYSTEM_ID(mixer_conf->mixer_id)) - break; - } - - if(!l) - return; - - for(l = mixer->elems; l; l = evas_list_next(l)) - { - melem = evas_list_data(l); - if(melem->elem_id == elem_conf->elem_id) - break; - } + Evas_List *l, *l1, *l2; - if(!l) - return; -#endif + for (l = face->volume->mixers; l; l = evas_list_next(l)) + { + mixer = evas_list_data(l); + if (MIXER_ID(mixer->name->mixer_id) == MIXER_ID(mixer_conf->mixer_id) && + SYSTEM_ID(mixer->name->mixer_id) == SYSTEM_ID(mixer_conf->mixer_id)) + break; + } + + if (!l) + return; + + for (l = mixer->elems; l; l = evas_list_next(l)) + { + melem = evas_list_data(l); + if (melem->elem_id == elem_conf->elem_id) + break; + } - if(elem_conf->active) - { - Mixer_Slider* slider; - slider = e_volume_slider_create_from_conf(elem_conf, face, 1); - if(slider) - { - slider->conf = elem_conf; - e_volume_pack_pack_weight(face, slider); - _mixer_update_mixer_slider(slider); - } - } - else - { - Mixer_Slider* slider; - Evas_List *l; - for(l = face->sliders; l; l = evas_list_next(l)) - { - slider = evas_list_data(l); - if(slider->conf->elem_id == elem_conf->elem_id) - break; - } - - if(l) - { - e_volume_pack_unpack(face, slider); - e_volume_slider_free(slider, 1); - } + if (!l) + return; +#endif - } + if (elem_conf->active) + { + Mixer_Slider *slider; + + slider = e_volume_slider_create_from_conf(elem_conf, face, 1); + if (slider) + { + slider->conf = elem_conf; + e_volume_pack_pack_weight(face, slider); + _mixer_update_mixer_slider(slider); + } + } + else + { + Mixer_Slider *slider; + Evas_List *l; + + for (l = face->sliders; l; l = evas_list_next(l)) + { + slider = evas_list_data(l); + if (slider->conf->elem_id == elem_conf->elem_id) + break; + } + + if (l) + { + e_volume_pack_unpack(face, slider); + e_volume_slider_free(slider, 1); + } + } - e_config_save_queue(); + e_config_save_queue(); } -void e_volume_face_mixers_create(Volume_Face* face) +void +e_volume_face_mixers_create(Volume_Face *face) { - Evas_List* l; - Volume* volume; - E_Container* con; - - volume = face->volume; - con = face->con; - int c; - - face->sliders = NULL; - for(c = 0, l = volume->mixers; l; l = evas_list_next(l)) - { - Mixer* mixer; -// DBG(stderr, "creating %d\n", c++); - mixer = evas_list_data(l); - e_volume_mixers_create(face, mixer, con->bg_evas, 1); - } - - //DBG(stderr,"face->sliders = %p\n", face->sliders); - - if(face->conf) - /* Also resize mixer object */ - { - int h; - int c; - c = evas_list_count(face->sliders); - h = (c + 1)* face->entry_height; - //DBG(stderr,"face->entry_height = %d\n", face->entry_height); - e_gadman_client_auto_size_set(face->gmc, 128, h); - } + Evas_List *l; + Volume *volume; + E_Container *con; + + volume = face->volume; + con = face->con; + int c; + + face->sliders = NULL; + for (c = 0, l = volume->mixers; l; l = evas_list_next(l)) + { + Mixer *mixer; + +// DBG(stderr, "creating %d\n", c++); + mixer = evas_list_data(l); + e_volume_mixers_create(face, mixer, con->bg_evas, 1); + } + + //DBG(stderr,"face->sliders = %p\n", face->sliders); + + if (face->conf) + /* Also resize mixer object */ + { + int h; + int c; + + c = evas_list_count(face->sliders); + h = (c + 1) * face->entry_height; + //DBG(stderr,"face->entry_height = %d\n", face->entry_height); + e_gadman_client_auto_size_set(face->gmc, 128, h); + } } -Volume_Face* e_volume_face_new(E_Container* con, Volume* volume) +Volume_Face * +e_volume_face_new(E_Container *con, Volume *volume) { - Volume_Face* face; - Evas_Object* o; - char buf[1024]; - - face = E_NEW(Volume_Face, 1); + Volume_Face *face; + Evas_Object *o; + char buf[1024]; - face->volume = volume; + face = E_NEW(Volume_Face, 1); - face->con = con; - e_object_ref(E_OBJECT(con)); - evas_event_freeze(con->bg_evas); + face->volume = volume; - o = edje_object_add(con->bg_evas); - face->main_object = o; - snprintf(buf, 1024, "%s/volume.edj", module_root); - edje_object_file_set(o, buf, - "volume/main"); + face->con = con; + e_object_ref(E_OBJECT(con)); + evas_event_freeze(con->bg_evas); - evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, - _volume_face_cb_mouse_down, face); + o = edje_object_add(con->bg_evas); + face->main_object = o; + snprintf(buf, 1024, "%s/volume.edj", module_root); + edje_object_file_set(o, buf, "volume/main"); - evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_UP, - _volume_face_cb_mouse_up, face); + evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, _volume_face_cb_mouse_down, face); - evas_key_modifier_add(evas_object_evas_get(o), "Control"); - evas_key_modifier_add(evas_object_evas_get(o), "Shift"); + evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_UP, _volume_face_cb_mouse_up, face); - evas_object_show(o); + evas_key_modifier_add(evas_object_evas_get(o), "Control"); + evas_key_modifier_add(evas_object_evas_get(o), "Shift"); - o = e_box_add(con->bg_evas); - face->box_object = o; - e_box_homogenous_set(o, 1); - edje_object_part_swallow(face->main_object, "items", face->box_object); - evas_object_show(o); + evas_object_show(o); + o = e_box_add(con->bg_evas); + face->box_object = o; + e_box_homogenous_set(o, 1); + edje_object_part_swallow(face->main_object, "items", face->box_object); + evas_object_show(o); - /* setup gadman */ - face->gmc = e_gadman_client_new(con->gadman); - e_gadman_client_domain_set(face->gmc, "module.evolume", _volume_count++); - e_gadman_client_policy_set(face->gmc, - E_GADMAN_POLICY_ANYWHERE | - E_GADMAN_POLICY_HMOVE | - E_GADMAN_POLICY_VMOVE | - E_GADMAN_POLICY_HSIZE | - E_GADMAN_POLICY_VSIZE); - e_gadman_client_min_size_set(face->gmc, 14, 7); - e_gadman_client_align_set(face->gmc, 1.0, 0.5); - + /* setup gadman */ + face->gmc = e_gadman_client_new(con->gadman); + e_gadman_client_domain_set(face->gmc, "module.evolume", _volume_count++); + e_gadman_client_policy_set(face->gmc, + E_GADMAN_POLICY_ANYWHERE | + E_GADMAN_POLICY_HMOVE | E_GADMAN_POLICY_VMOVE | E_GADMAN_POLICY_HSIZE | E_GADMAN_POLICY_VSIZE); + e_gadman_client_min_size_set(face->gmc, 14, 7); + e_gadman_client_align_set(face->gmc, 1.0, 0.5); - e_gadman_client_change_func_set(face->gmc, _volume_face_cb_gmc_change, - face); - e_gadman_client_load(face->gmc); + e_gadman_client_change_func_set(face->gmc, _volume_face_cb_gmc_change, face); + e_gadman_client_load(face->gmc); - _volume_face_cb_gmc_change((void*)face, face->gmc, - E_GADMAN_CHANGE_MOVE_RESIZE); + _volume_face_cb_gmc_change((void *)face, face->gmc, E_GADMAN_CHANGE_MOVE_RESIZE); - evas_event_thaw(con->bg_evas); + evas_event_thaw(con->bg_evas); - return face; + return face; } -int e_volume_face_free(Volume_Face* face) +int +e_volume_face_free(Volume_Face *face) { - Evas_List *l; + Evas_List *l; + + if (!face) + return 0; - if(!face) - return 0; + e_object_unref(E_OBJECT(face->con)); + e_object_del(E_OBJECT(face->gmc)); - e_object_unref(E_OBJECT(face->con)); - e_object_del(E_OBJECT(face->gmc)); + evas_object_del(face->box_object); + evas_object_del(face->main_object); - evas_object_del(face->box_object); - evas_object_del(face->main_object); + for (l = face->sliders; l; l = evas_list_next(l)) + { + Mixer_Slider *slider; - for(l = face->sliders; l; l = evas_list_next(l)) - { - Mixer_Slider* slider; - slider = evas_list_data(l); + slider = evas_list_data(l); - if(slider) - e_volume_slider_free(slider, 1); - } + if (slider) + e_volume_slider_free(slider, 1); + } - _volume_count--; + _volume_count--; - return 1; + return 1; } =================================================================== RCS file: /cvs/e/e_modules/evolume/src/module/e_mod_face.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_mod_face.h 21 Mar 2006 02:12:20 -0000 1.1 +++ e_mod_face.h 5 Apr 2006 17:48:48 -0000 1.2 @@ -6,37 +6,34 @@ typedef struct _Volume_Face Volume_Face; - struct _Volume_Face { - Evas_Object *main_object; - Evas_Object *box_object; - Evas_List *sliders; - E_Container *con; - - E_Menu *menu; - - int entry_height; - - E_Gadman_Client *gmc; - - Config_Face *conf; - Config_Container *con_config; - Volume *volume; + Evas_Object *main_object; + Evas_Object *box_object; + Evas_List *sliders; + E_Container *con; + + E_Menu *menu; + + int entry_height; - /* For mute */ - Evas_List *muted_melems; + E_Gadman_Client *gmc; + + Config_Face *conf; + Config_Container *con_config; + Volume *volume; + + /* For mute */ + Evas_List *muted_melems; }; -Volume_Face* e_volume_face_new(E_Container *con, Volume* volume); -int e_volume_face_free(Volume_Face* face); +Volume_Face *e_volume_face_new(E_Container *con, Volume *volume); +int e_volume_face_free(Volume_Face *face); + +void e_volume_face_mixers_update(Volume_Face *face); +void e_volume_face_mixers_create(Volume_Face *face); +int e_volume_mixers_free(Volume_Face *face, Mixer *mixer, int unref); -void e_volume_face_mixers_update(Volume_Face* face); -void e_volume_face_mixers_create(Volume_Face* face); -int e_volume_mixers_free(Volume_Face* face, Mixer* mixer, int unref); - -void e_volume_face_mixer_elem_update(Volume_Face* face, - Config_Mixer_Elem* elem_conf, - Config_Mixer* mixer_conf); +void e_volume_face_mixer_elem_update(Volume_Face *face, Config_Mixer_Elem *elem_conf, Config_Mixer *mixer_conf); #endif // E_MOD_FACE_INCLUDED =================================================================== RCS file: /cvs/e/e_modules/evolume/src/module/e_mod_main.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_mod_main.c 21 Mar 2006 02:12:20 -0000 1.1 +++ e_mod_main.c 5 Apr 2006 17:48:48 -0000 1.2 @@ -12,43 +12,41 @@ #include <Esmart/Esmart_Draggies.h> */ - #include "config.h" #include "e_mod_main.h" #include "e_mod_volume.h" -char* module_root = NULL; -char* module_theme = NULL; +char *module_root = NULL; +char *module_theme = NULL; -E_Module_Api e_modapi = -{ - E_MODULE_API_VERSION, - "eVolume" +E_Module_Api e_modapi = { + E_MODULE_API_VERSION, + "eVolume" }; - void * e_modapi_init(E_Module *module) { - Volume* volume; + Volume *volume; - bindtextdomain(PACKAGE, LOCALEDIR); - bind_textdomain_codeset(PACKAGE, "UTF-8"); + bindtextdomain(PACKAGE, LOCALEDIR); + bind_textdomain_codeset(PACKAGE, "UTF-8"); - module_root = e_module_dir_get(module); + module_root = e_module_dir_get(module); - { - char buf[128]; - snprintf(buf, 128, "%s/volume.edj", module_root); - module_theme = strdup(buf); - fprintf(stderr,"module_theme = %s\n", module_theme); - } - - /* actually init buttons */ - volume = e_volume_init(NULL); - module->config_menu = volume->config_menu; - return volume; + { + char buf[128]; + + snprintf(buf, 128, "%s/volume.edj", module_root); + module_theme = strdup(bu... [truncated message content] |