Module Name: src
Committed By: jmcneill
Date: Thu Sep 2 02:08:30 UTC 2010
Modified Files:
src/usr.bin/audiocfg: main.c
Log Message:
print the version field from AUDIO_GETDEV if present
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/audiocfg/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/audiocfg/main.c
diff -u src/usr.bin/audiocfg/main.c:1.3 src/usr.bin/audiocfg/main.c:1.4
--- src/usr.bin/audiocfg/main.c:1.3 Wed Sep 1 09:18:03 2010
+++ src/usr.bin/audiocfg/main.c Thu Sep 2 02:08:30 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.3 2010/09/01 09:18:03 wiz Exp $ */
+/* $NetBSD: main.c,v 1.4 2010/09/02 02:08:30 jmcneill Exp $ */
/*
* Copyright (c) 2010 Jared D. McNeill <jmcne...@invisible.ca>
@@ -62,9 +62,12 @@
n = audiodev_count();
for (i = 0; i < n; i++) {
adev = audiodev_get(i);
- printf("%u: [%c] %s: %s (%u playback channel%s)\n",
- i, adev->defaultdev ? '*' : ' ',
- adev->xname, adev->audio_device.name,
+ printf("%u: [%c] %s: ",
+ i, adev->defaultdev ? '*' : ' ', adev->xname);
+ printf("%s", adev->audio_device.name);
+ if (strlen(adev->audio_device.version) > 0)
+ printf(" %s", adev->audio_device.version);
+ printf(", %u playback channel%s\n",
adev->pchan, adev->pchan == 1 ? "" : "s");
}
} else if (strcmp(argv[1], "default") == 0 && argc == 3) {
