More fix to compile - removed snd_enum_incr and snd_int_to_enum macros.

diff --git a/alsactl/alsactl.c b/alsactl/alsactl.c
index 40598f0b8cde107882ffe7a7f7ead2ead6c444fc..458ce45dda6df1ed13ec17b7c4a1024c966a7b6d 100644 (file)
--- a/alsactl/alsactl.c
+++ b/alsactl/alsactl.c
@@ -529,7 +529,7 @@ static int config_iface(snd_config_t *n)
        default:
                return -1;
        }
-       for (idx = 0; idx <= SND_CTL_ELEM_IFACE_LAST; snd_enum_incr(idx)) {
+       for (idx = 0; idx <= SND_CTL_ELEM_IFACE_LAST; idx++) {
                if (strcasecmp(snd_ctl_elem_iface_name(idx), str) == 0)
                        return idx;
        }
@@ -684,7 +684,7 @@ static int set_control(snd_ctl_t *handle, snd_config_t *control)
        if (err < 0) {
                if (iface >= 0 && name) {
                        snd_ctl_elem_info_set_numid(info, 0);
-                       snd_ctl_elem_info_set_interface(info, snd_int_to_enum(iface));
+                       snd_ctl_elem_info_set_interface(info, iface);
                        snd_ctl_elem_info_set_device(info, device);
                        snd_ctl_elem_info_set_subdevice(info, subdevice);
                        snd_ctl_elem_info_set_name(info, name);

diff --git a/alsamixer/alsamixer.c b/alsamixer/alsamixer.c
index 9292f0aaa1ff35435dfda695e6d3a00ffe4f86d9..65e3e226c626d648c2dba35cf705adae74f695da 100644 (file)
--- a/alsamixer/alsamixer.c
+++ b/alsamixer/alsamixer.c
@@ -539,7 +539,7 @@ mixer_write_cbar (int elem_index)
       vright = vleft;
     if (vleft >= 0 && vright >= 0) {
       if (snd_mixer_selem_has_playback_volume_joined(elem)) {
-       for (chn = 0; chn < SND_MIXER_SCHN_LAST; snd_enum_incr(chn))
+       for (chn = 0; chn < SND_MIXER_SCHN_LAST; chn++)
          if (snd_mixer_selem_has_playback_channel(elem, chn))
            snd_mixer_selem_set_playback_volume(elem, chn, vleft);
          if (snd_mixer_selem_has_capture_channel(elem, chn))