Enlightenment CVS committal
Author : lok
Project : e_modules
Module : mixer
Dir : e_modules/mixer
Modified Files:
e_mod_main.c
Log Message:
Oops, sorry I totaly forgot to code the "don't show popup" feature.
===================================================================
RCS file: /cvs/e/e_modules/mixer/e_mod_main.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -3 -r1.60 -r1.61
--- e_mod_main.c 3 Feb 2007 06:31:46 -0000 1.60
+++ e_mod_main.c 3 Feb 2007 19:54:12 -0000 1.61
@@ -207,7 +207,7 @@
win = inst->mixer->gauge_win;
_mixer_volume_increase(inst->mixer, ci);
_mixer_window_gauge_send_vol(win, inst->mixer, ci);
- edje_object_signal_emit(win->pulsar, "vol,increase", "e");
+ if (win) edje_object_signal_emit(win->pulsar, "vol,increase", "e");
}
void
@@ -225,7 +225,7 @@
win = inst->mixer->gauge_win;
_mixer_volume_decrease(inst->mixer, ci);
_mixer_window_gauge_send_vol(win, inst->mixer, ci);
- edje_object_signal_emit(win->pulsar, "vol,decrease", "e");
+ if (win) edje_object_signal_emit(win->pulsar, "vol,decrease", "e");
}
void
@@ -1155,11 +1155,10 @@
Mixer_Win_Gauge *win;
char buf[4096];
- if (!inst || !inst->mixer) return;
+ if (!inst || !inst->mixer || !inst->gcc) return;
if (!(con = e_container_current_get(e_manager_current_get()))) return;
-
- ci = _mixer_config_item_get(inst->mixer, inst->gcc->id);
- if (!ci && !ci->show_popup) return;
+ if (!(ci = _mixer_config_item_get(inst->mixer, inst->gcc->id))) return;
+ if (!(ci->show_popup)) return;
if (!(win = inst->mixer->gauge_win))
{
@@ -1206,6 +1205,7 @@
Edje_Message_Int *msg;
int vol;
+ if (!ci || !(ci->show_popup) || !win) return;
if (!mixer || !mixer->mix_sys || !mixer->mix_sys->get_volume) return;
msg = malloc(sizeof(Edje_Message_Int));
vol = (int)mixer->mix_sys->get_volume(ci->card_id, ci->channel_id);
-------------------------------------------------------------------------
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
