|
Lines 1-6
Link Here
|
| 1 |
--- src/modules/module-detect.c.orig 2016-05-10 12:28:04 UTC |
1 |
--- src/modules/module-detect.c.orig 2017-09-03 11:41:12 UTC |
| 2 |
+++ src/modules/module-detect.c |
2 |
+++ src/modules/module-detect.c |
| 3 |
@@ -160,11 +160,45 @@ static int detect_oss(pa_core *c, int ju |
3 |
@@ -160,11 +160,41 @@ static int detect_oss(pa_core *c, int ju |
| 4 |
continue; |
4 |
continue; |
| 5 |
|
5 |
|
| 6 |
} else if (sscanf(line, "pcm%u: ", &device) == 1) { |
6 |
} else if (sscanf(line, "pcm%u: ", &device) == 1) { |
|
Lines 14-47
Link Here
|
| 14 |
+ continue; |
14 |
+ continue; |
| 15 |
+ |
15 |
+ |
| 16 |
+ if (!pa_endswith(line, "default")) |
16 |
+ if (!pa_endswith(line, "default")) |
| 17 |
+ continue; |
17 |
continue; |
| 18 |
+ |
18 |
+ |
| 19 |
+ const char *p = strrchr(line, '('); |
19 |
+ const char *p = strrchr(line, '('); |
| 20 |
+ |
20 |
+ |
| 21 |
+ if (!p) |
21 |
+ if (!p) |
| 22 |
continue; |
22 |
+ continue; |
| 23 |
+ |
23 |
+ |
| 24 |
+ if (!c->default_sink && (strstr(p, "play") || (strstr(p, "p:") && !strstr(p, "(0p:")))) { |
24 |
+ if (!c->configured_default_sink && (strstr(p, "play") || (strstr(p, "p:") && !strstr(p, "(0p:")))) { |
| 25 |
+ uint32_t idx = PA_IDXSET_INVALID; |
25 |
+ uint32_t idx = PA_IDXSET_INVALID; |
| 26 |
+ pa_sink *s; |
26 |
+ pa_sink *s; |
| 27 |
+ PA_IDXSET_FOREACH(s, c->sinks, idx) { |
27 |
+ PA_IDXSET_FOREACH(s, c->sinks, idx) { |
| 28 |
+ if (s->module == m) { |
28 |
+ if (s->module == m) { |
| 29 |
+ if (!pa_namereg_set_default_sink(c, s)) |
29 |
+ pa_core_set_configured_default_sink(c, s->name); |
| 30 |
+ pa_log_error("failed to set default sink for device: /dev/dsp%u", device); |
|
|
| 31 |
+ |
| 32 |
+ break; |
30 |
+ break; |
| 33 |
+ } |
31 |
+ } |
| 34 |
+ } |
32 |
+ } |
| 35 |
+ } |
33 |
+ } |
| 36 |
+ |
34 |
+ |
| 37 |
+ if (!c->default_source && (strstr(p, "rec") || (strstr(p, "r:") && !strstr(p, "/0r:")))) { |
35 |
+ if (!c->configured_default_source && (strstr(p, "rec") || (strstr(p, "r:") && !strstr(p, "/0r:")))) { |
| 38 |
+ uint32_t idx = PA_IDXSET_INVALID; |
36 |
+ uint32_t idx = PA_IDXSET_INVALID; |
| 39 |
+ pa_source *s; |
37 |
+ pa_source *s; |
| 40 |
+ PA_IDXSET_FOREACH(s, c->sources, idx) { |
38 |
+ PA_IDXSET_FOREACH(s, c->sources, idx) { |
| 41 |
+ if (s->module == m) { |
39 |
+ if (s->module == m) { |
| 42 |
+ if (!pa_namereg_set_default_source(c, s)) |
40 |
+ pa_core_set_configured_default_source(c, s->name); |
| 43 |
+ pa_log_error("failed to set default source for device: /dev/dsp%u", device); |
|
|
| 44 |
+ |
| 45 |
+ break; |
41 |
+ break; |
| 46 |
+ } |
42 |
+ } |
| 47 |
+ } |
43 |
+ } |