Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : mixer
Dir : e_modules/mixer
Modified Files:
e_mod_main.c
Log Message:
Fix up mixer config to allow selecting a card & channels.
===================================================================
RCS file: /cvs/e/e_modules/mixer/e_mod_main.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -3 -r1.69 -r1.70
--- e_mod_main.c 19 Nov 2007 11:04:59 -0000 1.69
+++ e_mod_main.c 20 Nov 2007 03:35:49 -0000 1.70
@@ -190,10 +190,21 @@
static const char *
_gc_id_new(void)
{
+ int num = 0;
+ char buf[128];
Config_Item *ci;
- ci = _mixer_config_item_get(NULL, NULL);
- return ci->id;
+ /* Create id */
+ if (mixer_config->items)
+ {
+ const char *p;
+
+ ci = evas_list_last(mixer_config->items)->data;
+ p = strrchr(ci->id, '.');
+ if (p) num = atoi(p + 1) + 1;
+ }
+ snprintf(buf, sizeof(buf), "%s.%d", _gc_class.name, num);
+ return strdup(buf);
}
void
@@ -331,33 +342,13 @@
Mixer_Channel *chan;
Evas_List *l;
Config_Item *ci;
- char buf[128];
mixer = data;
-
- if (!id)
- {
- int num = 0;
-
- /* Create id */
- if (mixer_config->items)
- {
- const char *p;
- ci = evas_list_last(mixer_config->items)->data;
- p = strrchr(ci->id, '.');
- if (p) num = atoi(p + 1) + 1;
- }
- snprintf(buf, sizeof(buf), "%s.%d", _gc_class.name, num);
- id = buf;
- }
- else
+ for (l = mixer_config->items; l; l = l->next)
{
- for (l = mixer_config->items; l; l = l->next)
- {
- ci = l->data;
- if (!ci->id) continue;
- if (!strcmp(ci->id, id)) return ci;
- }
+ ci = l->data;
+ if (!ci->id) continue;
+ if (!strcmp(ci->id, id)) return ci;
}
ci = E_NEW(Config_Item, 1);
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
