Added support for subtypes...

diff --git a/alsactl/setup.c b/alsactl/setup.c
index b2f7784ed240673ed0432a243f476abbab04a32b..7b157aa66c4fbe946b65f41ccd29a301334f242e 100644 (file)
--- a/alsactl/setup.c
+++ b/alsactl/setup.c
@@ -644,12 +644,15 @@ static void soundcard_setup_write_switch(FILE * out, const char *space, int inte
                break;
        case SND_SW_TYPE_BYTE:
                s = "byte";
-               sprintf(v, "%u", (unsigned int) sw->value.data8[0]);
+               if (sw->subtype == SND_SW_SUBTYPE_HEXA) {
+                       sprintf(v, "0x%x", (unsigned int) sw->value.data8[0]);
+               } else {
+                       sprintf(v, "%u", (unsigned int) sw->value.data8[0]);
+               }
                break;
        case SND_SW_TYPE_WORD:
                s = "word";
-               if (interface == SND_INTERFACE_CONTROL &&
-                   !strcmp(sw->name, SND_CTL_SW_JOYSTICK_ADDRESS)) {
+               if (sw->subtype == SND_SW_SUBTYPE_HEXA) {
                        sprintf(v, "0x%x", (unsigned int) sw->value.data16[0]);
                } else {
                        sprintf(v, "%u", (unsigned int) sw->value.data16[0]);
@@ -657,7 +660,11 @@ static void soundcard_setup_write_switch(FILE * out, const char *space, int inte
                break;
        case SND_SW_TYPE_DWORD:
                s = "dword";
-               sprintf(v, "%u", sw->value.data32[0]);
+               if (sw->subtype == SND_SW_SUBTYPE_HEXA) {
+                       sprintf(v, "0x%x", sw->value.data32[0]);
+               } else {
+                       sprintf(v, "%u", sw->value.data32[0]);
+               }
                break;
        case SND_SW_TYPE_USER:
                s = "user";