Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : mixer
Dir : e_modules/mixer
Modified Files:
alsa_mixer.c e_mod_main.c
Log Message:
Removed printf.
Moved around mute code.
===================================================================
RCS file: /cvs/e/e_modules/mixer/alsa_mixer.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- alsa_mixer.c 12 Sep 2006 21:17:27 -0000 1.20
+++ alsa_mixer.c 12 Sep 2006 21:25:13 -0000 1.21
@@ -487,7 +487,6 @@
{
snd_mixer_close(handle);
mute = alsa_get_volume(card_id, channel_id);
- printf("\n\nVolume from alsa mute: %i\n\n", mute);
if (mute <= 0)
return 1;
else
===================================================================
RCS file: /cvs/e/e_modules/mixer/e_mod_main.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -3 -r1.40 -r1.41
--- e_mod_main.c 12 Sep 2006 21:15:23 -0000 1.40
+++ e_mod_main.c 12 Sep 2006 21:25:13 -0000 1.41
@@ -582,31 +582,25 @@
edje_object_signal_emit(inst->mixer->base, "medium", "");
else if (vol > 66)
edje_object_signal_emit(inst->mixer->base, "high", "");
- else if (vol <= 0)
+
+ if (inst->mixer->mix_sys->get_mute)
{
- edje_object_signal_emit(inst->mixer->base, "muted", "");
-
edje_object_signal_emit(e_slider_edje_object_get(win->slider),
- "e,state,disabled", "e");
- }
- }
- }
-
- if (inst->mixer->mix_sys->get_mute)
- {
- int m;
+ int m;
- m = inst->mixer->mix_sys->get_mute(ci->card_id, ci->channel_id);
- e_widget_check_checked_set(win->check, m);
- if (m)
- {
- edje_object_signal_emit(inst->mixer->base, "muted", "");
- edje_object_signal_emit(e_slider_edje_object_get(win->slider),
- "e,state,disabled", "e");
- }
- else
- {
- edje_object_signal_emit(e_slider_edje_object_get(win->slider),
- "e,state,enabled", "e");
+ m = inst->mixer->mix_sys->get_mute(ci->card_id,
ci->channel_id);
+ e_widget_check_checked_set(win->check, m);
+ if (m)
+ {
+ edje_object_signal_emit(inst->mixer->base, "muted", "");
+
edje_object_signal_emit(e_slider_edje_object_get(win->slider),
+ "e,state,disabled", "e");
+ }
+ else
+ {
+
edje_object_signal_emit(e_slider_edje_object_get(win->slider),
+ "e,state,enabled", "e");
+ }
+ }
}
}
-------------------------------------------------------------------------
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
