Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : mixer
Dir : e_modules/mixer
Modified Files:
e_mod_config.c
Log Message:
Traps for card/channels being NULL.
===================================================================
RCS file: /cvs/e/e_modules/mixer/e_mod_config.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- e_mod_config.c 11 Sep 2006 11:23:01 -0000 1.6
+++ e_mod_config.c 11 Sep 2006 12:07:34 -0000 1.7
@@ -109,23 +109,27 @@
if (mixer->mix_sys->get_card)
{
card = mixer->mix_sys->get_card(ci->card_id);
- if (mixer->mix_sys->get_channels)
- card->channels = mixer->mix_sys->get_channels(card);
-
- of = e_widget_framelist_add(evas, _("Available Mixers"), 0);
- mg = e_widget_radio_group_new(&cfdata->channel_id);
- ob = e_widget_radio_add(evas, _("Unknown"), 0, mg);
- e_widget_framelist_object_append(of, ob);
- for (chans = card->channels; chans; chans = chans->next)
+ if ((mixer->mix_sys->get_channels) && (card))
{
- Mixer_Channel *chan;
-
- chan = chans->data;
- if (!chan) continue;
- ob = e_widget_radio_add(evas, (char *)chan->name, chan->id, mg);
- e_widget_framelist_object_append(of, ob);
- }
- e_widget_list_object_append(o, of, 1, 1, 0.5);
+ card->channels = mixer->mix_sys->get_channels(card);
+ if (card->channels)
+ {
+ of = e_widget_framelist_add(evas, _("Available Mixers"), 0);
+ mg = e_widget_radio_group_new(&cfdata->channel_id);
+ ob = e_widget_radio_add(evas, _("Unknown"), 0, mg);
+ e_widget_framelist_object_append(of, ob);
+ for (chans = card->channels; chans; chans = chans->next)
+ {
+ Mixer_Channel *chan;
+
+ chan = chans->data;
+ if (!chan) continue;
+ ob = e_widget_radio_add(evas, (char *)chan->name,
chan->id, mg);
+ e_widget_framelist_object_append(of, ob);
+ }
+ e_widget_list_object_append(o, of, 1, 1, 0.5);
+ }
+ }
}
return o;
}
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
