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
|
--- mixer-oss.c.orig 2004-05-13 00:27:04 UTC
+++ mixer-oss.c
@@ -94,7 +94,9 @@ static int prev_modify_counter = -1;
static bool get_mixer_state(void)
{
+#if 0
struct mixer_info m_info;
+#endif
int dev_lr_volume, dev_left_volume, dev_right_volume;
float left, right;
int srcmask;
@@ -103,14 +105,16 @@ static bool get_mixer_state(void)
/* to really keep track of updates */
static MixerChannel oldmixer[SOUND_MIXER_NRDEVICES];
+#if 0
ioctl(mixer_fd, SOUND_MIXER_INFO, &m_info);
+
if (m_info.modify_counter == prev_modify_counter)
/*
* Mixer state has not changed
*/
return false;
-
+#endif
/* Mixer state was changed by another program, so we need
* to update. As OSS cannot tell us specifically which
* channels changed, we read all of them in.
@@ -157,7 +161,7 @@ static bool get_mixer_state(void)
}
mixer[ch].is_recording = ((1 << mixer[ch].dev) & srcmask) != 0;
}
- prev_modify_counter = m_info.modify_counter;
+ /* prev_modify_counter = m_info.modify_counter; */
/* check if this was due to OSS stupidity or if we really changed */
if (!memcmp(&mixer, &oldmixer, sizeof(mixer))) {
memcpy(&oldmixer, &mixer, sizeof(mixer));
@@ -224,7 +228,9 @@ static void set_record_state(void)
void mixer_init(const char *mixer_device, bool verbose, const char * exclude[])
{
int devmask, srcmask, recmask, stmask;
+#if 0
struct mixer_info m_info;
+#endif
int count;
int mask;
@@ -256,15 +262,19 @@ void mixer_init(const char *mixer_device
exit(EXIT_FAILURE);
}
+#if 0
if (ioctl(mixer_fd, SOUND_MIXER_INFO, &m_info) == -1) {
fputs("error: could not read mixer info\n", stderr);
+ perror("ioctl");
exit(EXIT_FAILURE);
}
+
if (verbose) {
printf("%s (%s)\n", m_info.name, m_info.id);
puts("Supported channels:");
}
+#endif
for (count = 0; count < SOUND_MIXER_NRDEVICES; count++) {
mask = 1 << count;
if ((mask & devmask) && (!is_exclude((short_names[count]),exclude))) {
|
