Changeset a68e5e2 in mainline

Timestamp:

2011-11-11T17:23:04Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

4440581

Parents:

88dcd19

Message:

sb16: Minor mixer changes.

File:

• uspace/drv/audio/sb16/mixer.c (modified) (1 diff)

uspace/drv/audio/sb16/mixer.c

@@ -144 +144 @@
         if (!sb_mixer_get_control_item_count(mixer))
                 return;
-        unsigned levels = 0, channels = 0, current_level;
+        const unsigned item = 0; /* 0 is Master. */
+        unsigned levels = 0, channels = 0, level;
         const char *name = NULL;
-        sb_mixer_get_control_item_info(mixer, 0, &name, &channels, &levels);
-        unsigned channel = 0;
-        for (;channel < channels; ++channel) {
-                current_level =
-                    sb_mixer_get_volume_level(mixer, 0, channel);
+
+        sb_mixer_get_control_item_info(mixer, item, &name, &channels, &levels);
+        for (unsigned channel = 0; channel < channels; ++channel) {
+                level = sb_mixer_get_volume_level(mixer, item, channel);
                 ddf_log_note("Setting %s channel %d to %d (%d).\n",
-                    name, channel, levels - 1, current_level);
-
-                sb_mixer_set_volume_level(mixer, 0, channel, levels - 1);
-
-                current_level =
-                    sb_mixer_get_volume_level(mixer, 0, channel);
+                    name, channel, levels - 1, level);
+
+                sb_mixer_set_volume_level(mixer, item, channel, levels - 1);
+
+                level = sb_mixer_get_volume_level(mixer, item, channel);
                 ddf_log_note("%s channel %d set to %d.\n",
-                    name, channel, current_level);
+                    name, channel, level);
         }
-
 }
 /*----------------------------------------------------------------------------*/