Attachment #212877 for bug #245156

Lines 6-11 Link Here

(-)Makefile (+1 lines)
6		6
7	PORTNAME= pulseaudio	7	PORTNAME= pulseaudio
8	PORTVERSION= 13.0	8	PORTVERSION= 13.0
		9	PORTREVISION= 1
9	CATEGORIES= audio	10	CATEGORIES= audio
10	MASTER_SITES= http://freedesktop.org/software/pulseaudio/releases/	11	MASTER_SITES= http://freedesktop.org/software/pulseaudio/releases/
11		12




Support 24bit audio see Comment 6 of 
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=198567

--- src/modules/oss/oss-util.c.orig	2018-07-13 19:06:14 UTC
+++ src/modules/oss/oss-util.c
@@ -39,6 +39,22 @@
 

         [PA_SAMPLE_S24_32LE] = AFMT_QUERY, /* not supported */
         [PA_SAMPLE_S24_32BE] = AFMT_QUERY, /* not supported */
     };
@@ -348,7 +364,7 @@ int pa_oss_get_hw_description(const char
     }
 
     while (!feof(f)) {
-        char line[64];
+        char line[1024];
         int device;
 
         if (!fgets(line, sizeof(line), f))
@@ -357,26 +373,36 @@ int pa_oss_get_hw_description(const char
         line[strcspn(line, "\r\n")] = 0;
 
         if (!b) {
-            b = pa_streq(line, "Audio devices:");
+            b = pa_streq(line, "Installed devices:");
             continue;
         }
 
         if (line[0] == 0)
             break;
 
-        if (sscanf(line, "%i: ", &device) != 1)
+        if (sscanf(line, "%*[a-z]%i: ", &device) != 1)
             continue;
 
         if (device == n) {
             char *k = strchr(line, ':');
             pa_assert(k);
+            const size_t klen = strlen(line) - strlen(k) + 1;
+            char nameunit[klen + 1];
+            nameunit[klen] = '\0';
+            strncpy(nameunit, line, klen);
             k++;
-            k += strspn(k, " ");
+            k += strspn(k, " <");
+            const char *e = strrchr(k, '>');
 
-            if (pa_endswith(k, " (DUPLEX)"))
-                k[strlen(k)-9] = 0;
+            if (!e)
+                break;
 
-            pa_strlcpy(name, k, l);
+            const size_t len = strlen(k) - strlen(e);
+            char desc[len + 1];
+            desc[len] = '\0';
+            strncpy(desc, k, len);
+
+            pa_snprintf(name, l, "%s %s", nameunit, desc);
             r = 0;
             break;
         }

Return to bug 245156

Lines 1-7 Link Here

(-)files/patch-src_modules_oss_oss-util.c (-1 / +53 lines)
1	Support 24bit audio see Comment 6 of	1	Support 24bit audio see Comment 6 of
2	https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=198567	2	https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=198567
3		3
4	--- src/modules/oss/oss-util.c.orig 2015-09-10 04:51:41 UTC	4	--- src/modules/oss/oss-util.c.orig 2018-07-13 19:06:14 UTC
5	+++ src/modules/oss/oss-util.c	5	+++ src/modules/oss/oss-util.c
6	@@ -39,6 +39,22 @@	6	@@ -39,6 +39,22 @@
7		7
Lines 37-39 Link Here
37	[PA_SAMPLE_S24_32LE] = AFMT_QUERY, /* not supported */	37	[PA_SAMPLE_S24_32LE] = AFMT_QUERY, /* not supported */
38	[PA_SAMPLE_S24_32BE] = AFMT_QUERY, /* not supported */	38	[PA_SAMPLE_S24_32BE] = AFMT_QUERY, /* not supported */
39	};	39	};
		40	@@ -348,7 +364,7 @@ int pa_oss_get_hw_description(const char
		41	}
		42
		43	while (!feof(f)) {
		44	- char line[64];
		45	+ char line[1024];
		46	int device;
		47
		48	if (!fgets(line, sizeof(line), f))
		49	@@ -357,26 +373,36 @@ int pa_oss_get_hw_description(const char
		50	line[strcspn(line, "\r\n")] = 0;
		51
		52	if (!b) {
		53	- b = pa_streq(line, "Audio devices:");
		54	+ b = pa_streq(line, "Installed devices:");
		55	continue;
		56	}
		57
		58	if (line[0] == 0)
		59	break;
		60
		61	- if (sscanf(line, "%i: ", &device) != 1)
		62	+ if (sscanf(line, "%*[a-z]%i: ", &device) != 1)
		63	continue;
		64
		65	if (device == n) {
		66	char *k = strchr(line, ':');
		67	pa_assert(k);
		68	+ const size_t klen = strlen(line) - strlen(k) + 1;
		69	+ char nameunit[klen + 1];
		70	+ nameunit[klen] = '\0';
		71	+ strncpy(nameunit, line, klen);
		72	k++;
		73	- k += strspn(k, " ");
		74	+ k += strspn(k, " <");
		75	+ const char *e = strrchr(k, '>');
		76
		77	- if (pa_endswith(k, " (DUPLEX)"))
		78	- k[strlen(k)-9] = 0;
		79	+ if (!e)
		80	+ break;
		81
		82	- pa_strlcpy(name, k, l);
		83	+ const size_t len = strlen(k) - strlen(e);
		84	+ char desc[len + 1];
		85	+ desc[len] = '\0';
		86	+ strncpy(desc, k, len);
		87	+
		88	+ pa_snprintf(name, l, "%s %s", nameunit, desc);
		89	r = 0;
		90	break;
		91	}