1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
|
--- src/modules/oss/module-oss.c.orig 2024-01-12 17:22:09 UTC
+++ src/modules/oss/module-oss.c
@@ -121,9 +121,6 @@ struct userdata {
int fd;
int mode;
- int mixer_fd;
- int mixer_devmask;
-
int nfrags, frag_size, orig_frag_size;
bool shutdown;
@@ -819,75 +816,145 @@ static int source_set_state_in_io_thread_cb(pa_source
return 0;
}
+static int open_mixer(struct userdata *u, int *p_devmask) {
+ int mixer_fd;
+
+ mixer_fd = pa_oss_open_mixer_for_device(u->device_name);
+ if (mixer_fd < 0)
+ return (mixer_fd);
+
+ if (ioctl(mixer_fd, SOUND_MIXER_READ_DEVMASK, p_devmask) < 0) {
+ pa_log_warn("SOUND_MIXER_READ_DEVMASK failed: %s", pa_cstrerror(errno));
+ pa_close(mixer_fd);
+ return (-1);
+ }
+ return (mixer_fd);
+}
+
+static void oss_get_dummy_volume(const pa_sample_spec *ss, pa_cvolume *volume) {
+ char cv[PA_CVOLUME_SNPRINT_VERBOSE_MAX];
+ unsigned vol;
+
+ pa_assert(ss);
+ pa_assert(volume);
+
+ vol = 100 | (100 << 8);
+
+ pa_cvolume_reset(volume, ss->channels);
+
+ volume->values[0] = PA_CLAMP_VOLUME(((vol & 0xFF) * PA_VOLUME_NORM) / 100);
+
+ if (volume->channels >= 2)
+ volume->values[1] = PA_CLAMP_VOLUME((((vol >> 8) & 0xFF) * PA_VOLUME_NORM) / 100);
+
+ pa_log_debug("Read dummy settings: %s", pa_cvolume_snprint_verbose(cv, sizeof(cv), volume, NULL, false));
+}
+
static void sink_get_volume(pa_sink *s) {
struct userdata *u;
+ int mixer_fd;
+ int mixer_devmask;
+
pa_assert_se(u = s->userdata);
- pa_assert(u->mixer_devmask & (SOUND_MASK_VOLUME|SOUND_MASK_PCM));
+ mixer_fd = open_mixer(u, &mixer_devmask);
+ if (mixer_fd < 0) {
+ oss_get_dummy_volume(&s->sample_spec, &s->real_volume);
+ return;
+ }
- if (u->mixer_devmask & SOUND_MASK_VOLUME)
- if (pa_oss_get_volume(u->mixer_fd, SOUND_MIXER_READ_VOLUME, &s->sample_spec, &s->real_volume) >= 0)
- return;
+ if (mixer_devmask & SOUND_MASK_VOLUME)
+ if (pa_oss_get_volume(mixer_fd, SOUND_MIXER_READ_VOLUME, &s->sample_spec, &s->real_volume) >= 0)
+ goto done;
- if (u->mixer_devmask & SOUND_MASK_PCM)
- if (pa_oss_get_volume(u->mixer_fd, SOUND_MIXER_READ_PCM, &s->sample_spec, &s->real_volume) >= 0)
- return;
+ if (mixer_devmask & SOUND_MASK_PCM)
+ if (pa_oss_get_volume(mixer_fd, SOUND_MIXER_READ_PCM, &s->sample_spec, &s->real_volume) >= 0)
+ goto done;
+ oss_get_dummy_volume(&s->sample_spec, &s->real_volume);
+
pa_log_info("Device doesn't support reading mixer settings: %s", pa_cstrerror(errno));
+done:
+ pa_close(mixer_fd);
}
static void sink_set_volume(pa_sink *s) {
struct userdata *u;
+ int mixer_fd;
+ int mixer_devmask;
+
pa_assert_se(u = s->userdata);
- pa_assert(u->mixer_devmask & (SOUND_MASK_VOLUME|SOUND_MASK_PCM));
+ mixer_fd = open_mixer(u, &mixer_devmask);
+ if (mixer_fd < 0)
+ return;
- if (u->mixer_devmask & SOUND_MASK_VOLUME)
- (void) pa_oss_set_volume(u->mixer_fd, SOUND_MIXER_WRITE_VOLUME, &s->sample_spec, &s->real_volume);
+ if (mixer_devmask & SOUND_MASK_VOLUME)
+ (void) pa_oss_set_volume(mixer_fd, SOUND_MIXER_WRITE_VOLUME, &s->sample_spec, &s->real_volume);
- if (u->mixer_devmask & SOUND_MASK_PCM)
- (void) pa_oss_set_volume(u->mixer_fd, SOUND_MIXER_WRITE_PCM, &s->sample_spec, &s->real_volume);
+ if (mixer_devmask & SOUND_MASK_PCM)
+ (void) pa_oss_set_volume(mixer_fd, SOUND_MIXER_WRITE_PCM, &s->sample_spec, &s->real_volume);
+
+ pa_close(mixer_fd);
}
static void source_get_volume(pa_source *s) {
struct userdata *u;
+ int mixer_fd;
+ int mixer_devmask;
+
pa_assert_se(u = s->userdata);
- pa_assert(u->mixer_devmask & (SOUND_MASK_MIC|SOUND_MASK_IGAIN|SOUND_MASK_RECLEV));
+ mixer_fd = open_mixer(u, &mixer_devmask);
+ if (mixer_fd < 0) {
+ oss_get_dummy_volume(&s->sample_spec, &s->real_volume);
+ return;
+ }
- if (u->mixer_devmask & SOUND_MASK_IGAIN)
- if (pa_oss_get_volume(u->mixer_fd, SOUND_MIXER_READ_IGAIN, &s->sample_spec, &s->real_volume) >= 0)
- return;
+ if (mixer_devmask & SOUND_MASK_IGAIN)
+ if (pa_oss_get_volume(mixer_fd, SOUND_MIXER_READ_IGAIN, &s->sample_spec, &s->real_volume) >= 0)
+ goto done;
- if (u->mixer_devmask & SOUND_MASK_RECLEV)
- if (pa_oss_get_volume(u->mixer_fd, SOUND_MIXER_READ_RECLEV, &s->sample_spec, &s->real_volume) >= 0)
- return;
+ if (mixer_devmask & SOUND_MASK_RECLEV)
+ if (pa_oss_get_volume(mixer_fd, SOUND_MIXER_READ_RECLEV, &s->sample_spec, &s->real_volume) >= 0)
+ goto done;
- if (u->mixer_devmask & SOUND_MASK_MIC)
- if (pa_oss_get_volume(u->mixer_fd, SOUND_MIXER_READ_MIC, &s->sample_spec, &s->real_volume) >= 0)
- return;
+ if (mixer_devmask & SOUND_MASK_MIC)
+ if (pa_oss_get_volume(mixer_fd, SOUND_MIXER_READ_MIC, &s->sample_spec, &s->real_volume) >= 0)
+ goto done;
+ oss_get_dummy_volume(&s->sample_spec, &s->real_volume);
+
pa_log_info("Device doesn't support reading mixer settings: %s", pa_cstrerror(errno));
+done:
+ pa_close(mixer_fd);
}
static void source_set_volume(pa_source *s) {
struct userdata *u;
+ int mixer_fd;
+ int mixer_devmask;
+
pa_assert_se(u = s->userdata);
- pa_assert(u->mixer_devmask & (SOUND_MASK_MIC|SOUND_MASK_IGAIN|SOUND_MASK_RECLEV));
+ mixer_fd = open_mixer(u, &mixer_devmask);
+ if (mixer_fd < 0)
+ return;
- if (u->mixer_devmask & SOUND_MASK_IGAIN)
- (void) pa_oss_set_volume(u->mixer_fd, SOUND_MIXER_WRITE_IGAIN, &s->sample_spec, &s->real_volume);
+ if (mixer_devmask & SOUND_MASK_IGAIN)
+ (void) pa_oss_set_volume(mixer_fd, SOUND_MIXER_WRITE_IGAIN, &s->sample_spec, &s->real_volume);
- if (u->mixer_devmask & SOUND_MASK_RECLEV)
- (void) pa_oss_set_volume(u->mixer_fd, SOUND_MIXER_WRITE_RECLEV, &s->sample_spec, &s->real_volume);
+ if (mixer_devmask & SOUND_MASK_RECLEV)
+ (void) pa_oss_set_volume(mixer_fd, SOUND_MIXER_WRITE_RECLEV, &s->sample_spec, &s->real_volume);
- if (u->mixer_devmask & SOUND_MASK_MIC)
- (void) pa_oss_set_volume(u->mixer_fd, SOUND_MIXER_WRITE_MIC, &s->sample_spec, &s->real_volume);
+ if (mixer_devmask & SOUND_MASK_MIC)
+ (void) pa_oss_set_volume(mixer_fd, SOUND_MIXER_WRITE_MIC, &s->sample_spec, &s->real_volume);
+
+ pa_close(mixer_fd);
}
static void thread_func(void *userdata) {
@@ -1158,16 +1225,6 @@ static void thread_func(void *userdata) {
revents = pollfd->revents;
} else
revents = 0;
-
- /* check for mixer shutdown, if any */
- if ((revents & (POLLOUT | POLLIN)) == 0) {
- int mixer_fd = u->mixer_fd;
- int devmask;
- if (mixer_fd > -1 && ioctl(mixer_fd, SOUND_MIXER_READ_DEVMASK, &devmask) < 0) {
- pa_log("Mixer shutdown.");
- goto fail;
- }
- }
}
fail:
@@ -1245,6 +1302,8 @@ int pa__init(pa_module*m) {
}
#ifndef __FreeBSD__
+/* Disable mmap. The OSS on FreeBSD doesn't support read & write on
+ the same socket */
if (use_mmap && mode == O_WRONLY) {
pa_log_info("Device opened for playback only, cannot do memory mapping, falling back to UNIX write() mode.");
use_mmap = false;
@@ -1277,8 +1336,6 @@ int pa__init(pa_module*m) {
u->module = m;
m->userdata = u;
u->fd = fd;
- u->mixer_fd = -1;
- u->mixer_devmask = 0;
u->use_getospace = u->use_getispace = true;
u->use_getodelay = true;
u->mode = mode;
@@ -1449,36 +1506,19 @@ int pa__init(pa_module*m) {
u->out_mmap_memblocks = pa_xnew0(pa_memblock*, u->out_nfrags);
}
- if ((u->mixer_fd = pa_oss_open_mixer_for_device(u->device_name)) >= 0) {
- bool do_close = true;
-
- if (ioctl(u->mixer_fd, SOUND_MIXER_READ_DEVMASK, &u->mixer_devmask) < 0)
- pa_log_warn("SOUND_MIXER_READ_DEVMASK failed: %s", pa_cstrerror(errno));
- else {
- if (u->sink && (u->mixer_devmask & (SOUND_MASK_VOLUME|SOUND_MASK_PCM))) {
- pa_log_debug("Found hardware mixer track for playback.");
- pa_sink_set_get_volume_callback(u->sink, sink_get_volume);
- pa_sink_set_set_volume_callback(u->sink, sink_set_volume);
- u->sink->n_volume_steps = 101;
- do_close = false;
- }
-
- if (u->source && (u->mixer_devmask & (SOUND_MASK_MIC|SOUND_MASK_RECLEV|SOUND_MASK_IGAIN))) {
- pa_log_debug("Found hardware mixer track for recording.");
- pa_source_set_get_volume_callback(u->source, source_get_volume);
- pa_source_set_set_volume_callback(u->source, source_set_volume);
- u->source->n_volume_steps = 101;
- do_close = false;
- }
- }
-
- if (do_close) {
- pa_close(u->mixer_fd);
- u->mixer_fd = -1;
- u->mixer_devmask = 0;
- }
+ if (u->sink) {
+ pa_log_debug("Found hardware mixer track for playback.");
+ pa_sink_set_get_volume_callback(u->sink, sink_get_volume);
+ pa_sink_set_set_volume_callback(u->sink, sink_set_volume);
+ u->sink->n_volume_steps = 101;
}
+ if (u->source) {
+ pa_log_debug("Found hardware mixer track for recording.");
+ pa_source_set_get_volume_callback(u->source, source_get_volume);
+ pa_source_set_set_volume_callback(u->source, source_set_volume);
+ u->source->n_volume_steps = 101;
+ }
go_on:
pa_assert(u->source || u->sink);
@@ -1594,9 +1634,6 @@ void pa__done(pa_module*m) {
if (u->fd >= 0)
pa_close(u->fd);
-
- if (u->mixer_fd >= 0)
- pa_close(u->mixer_fd);
pa_xfree(u->device_name);
|
