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:
Fix formatting.
Fix setting mute/unmute & storing volume.
Fix slider direction; actually works as it should now.
Fix slider value; goes from 0 - 100 now.
===================================================================
RCS file: /cvs/e/e_modules/mixer/alsa_mixer.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -3 -r1.39 -r1.40
--- alsa_mixer.c 22 Dec 2007 20:33:03 -0000 1.39
+++ alsa_mixer.c 22 Dec 2007 21:00:25 -0000 1.40
@@ -340,11 +340,9 @@
snd_mixer_selem_get_id(elem, sid);
if (!snd_mixer_selem_is_active(elem)) continue;
- if (muted && !snd_mixer_selem_has_playback_switch(elem))
- {
- v = (vol < 0) ? -vol: vol;
- ecore_hash_set(vols, (int*)(card_id << 16) + channel_id, (int*)v);
- }
+ if ((muted) && (!snd_mixer_selem_has_playback_switch(elem)))
+ ecore_hash_set(vols, (int*)(card_id << 16) + channel_id,
(int*)alsa_get_volume(card_id, channel_id));
+
if (snd_mixer_selem_has_playback_volume(elem))
{
const char *name;
@@ -465,7 +463,6 @@
ecore_hash_free_key_cb_set(vols, NULL);
ecore_hash_free_value_cb_set(vols, NULL);
}
-
if (mute)
{
muted = 1;
===================================================================
RCS file: /cvs/e/e_modules/mixer/e_mod_main.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -3 -r1.77 -r1.78
--- e_mod_main.c 22 Dec 2007 20:33:03 -0000 1.77
+++ e_mod_main.c 22 Dec 2007 21:00:25 -0000 1.78
@@ -606,9 +606,9 @@
{
if (val < 33)
edje_object_signal_emit(mixer->base, "low", "");
- else if ((val >= 34) && (val < 66))
+ else if ((val >= 33) && (val < 66))
edje_object_signal_emit(mixer->base, "medium", "");
- else if (val > 66)
+ else if (val >= 66)
edje_object_signal_emit(mixer->base, "high", "");
}
}
@@ -683,10 +683,10 @@
e_box_orientation_set(win->vbox, 0);
win->slider = e_slider_add(win->window->evas);
- e_slider_value_range_set(win->slider, 0.0, 1.0);
+ e_slider_value_range_set(win->slider, 0.0, 100.0);
e_slider_orientation_set(win->slider, 0);
/* TODO: Fix this in e_slider... */
- //e_slider_direction_set(win->slider, 1);
+// e_slider_direction_set(win->slider, 1);
evas_object_show(win->slider);
e_slider_min_size_get(win->slider, &mw, &mh);
e_box_pack_start(win->vbox, win->slider);
@@ -750,22 +750,22 @@
if (inst->mixer->mix_sys->get_volume)
{
int vol;
- double v;
-
- if ((inst->ci->card_id != 0) && (inst->ci->channel_id != 0))
+// double v;
+
+ if (inst->ci->channel_id != 0)
{
edje_object_signal_emit(e_slider_edje_object_get(win->slider),
"e,state,enabled", "e");
vol = inst->mixer->mix_sys->get_volume(inst->ci->card_id,
inst->ci->channel_id);
- v = (1.0 - ((double)vol / 100));
- e_slider_value_set(win->slider, v);
+// v = (1.0 - ((double)vol / 100));
+ e_slider_value_set(win->slider, vol);
if (vol < 33)
edje_object_signal_emit(inst->mixer->base, "low", "");
- else if ((vol >= 34) && (vol < 66))
+ else if ((vol >= 33) && (vol < 66))
edje_object_signal_emit(inst->mixer->base, "medium", "");
- else if (vol > 66)
+ else if (vol >= 66)
edje_object_signal_emit(inst->mixer->base, "high", "");
-
+
if (inst->mixer->mix_sys->get_mute)
{
int m;
@@ -942,8 +942,8 @@
if (!(mixer = win->mixer)) return;
if (!mixer->mix_sys) return;
if (!mixer->mix_sys->set_volume) return;
-
- val = ((1.0 - (e_slider_value_get(obj))) * 100);
+
+ val = e_slider_value_get(obj);
_mixer_simple_volume_change(mixer, mixer->inst->ci, val);
}
-------------------------------------------------------------------------
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
