|
Lines 1-4
Link Here
|
| 1 |
--- drivers/oss/oss_driver.c.orig 2016-02-23 15:13:53 UTC |
1 |
--- drivers/oss/oss_driver.c.orig 2017-01-10 10:20:51 UTC |
| 2 |
+++ drivers/oss/oss_driver.c |
2 |
+++ drivers/oss/oss_driver.c |
| 3 |
@@ -23,6 +23,7 @@ |
3 |
@@ -23,6 +23,7 @@ |
| 4 |
|
4 |
|
|
Lines 83-89
Link Here
|
| 83 |
dstidx += chcount; |
83 |
dstidx += chcount; |
| 84 |
} |
84 |
} |
| 85 |
break; |
85 |
break; |
| 86 |
@@ -441,19 +454,7 @@ static int oss_driver_start (oss_driver_ |
86 |
@@ -429,7 +442,11 @@ static int oss_driver_detach (oss_driver |
|
|
87 |
|
| 88 |
static int oss_driver_start (oss_driver_t *driver) |
| 89 |
{ |
| 90 |
- int flags = 0; |
| 91 |
+#if defined(OPTION_COOKEDMODE) |
| 92 |
+ int cookedmode = 1; |
| 93 |
+#else |
| 94 |
+ int cookedmode = 0; |
| 95 |
+#endif |
| 96 |
int format; |
| 97 |
int channels; |
| 98 |
int samplerate; |
| 99 |
@@ -441,19 +458,7 @@ static int oss_driver_start (oss_driver_ |
| 87 |
const char *indev = driver->indev; |
100 |
const char *indev = driver->indev; |
| 88 |
const char *outdev = driver->outdev; |
101 |
const char *outdev = driver->outdev; |
| 89 |
|
102 |
|
|
Lines 104-110
Link Here
|
| 104 |
driver->trigger = 0; |
117 |
driver->trigger = 0; |
| 105 |
if (strcmp (indev, outdev) != 0) { |
118 |
if (strcmp (indev, outdev) != 0) { |
| 106 |
if (driver->capture_channels > 0) { |
119 |
if (driver->capture_channels > 0) { |
| 107 |
@@ -705,7 +706,9 @@ static int oss_driver_start (oss_driver_ |
120 |
@@ -464,7 +469,7 @@ static int oss_driver_start (oss_driver_ |
|
|
121 |
indev, __FILE__, __LINE__, errno); |
| 122 |
} |
| 123 |
#ifndef OSS_NO_COOKED_MODE |
| 124 |
- ioctl (infd, SNDCTL_DSP_COOKEDMODE, &flags); |
| 125 |
+ ioctl (infd, SNDCTL_DSP_COOKEDMODE, &cookedmode); |
| 126 |
#endif |
| 127 |
fragsize = driver->period_size * |
| 128 |
driver->capture_channels * samplesize; |
| 129 |
@@ -479,7 +484,7 @@ static int oss_driver_start (oss_driver_ |
| 130 |
outdev, __FILE__, __LINE__, errno); |
| 131 |
} |
| 132 |
#ifndef OSS_NO_COOKED_MODE |
| 133 |
- ioctl (outfd, SNDCTL_DSP_COOKEDMODE, &flags); |
| 134 |
+ ioctl (outfd, SNDCTL_DSP_COOKEDMODE, &cookedmode); |
| 135 |
#endif |
| 136 |
fragsize = driver->period_size * |
| 137 |
driver->playback_channels * samplesize; |
| 138 |
@@ -497,7 +502,7 @@ static int oss_driver_start (oss_driver_ |
| 139 |
return -1; |
| 140 |
} |
| 141 |
#ifndef OSS_NO_COOKED_MODE |
| 142 |
- ioctl (infd, SNDCTL_DSP_COOKEDMODE, &flags); |
| 143 |
+ ioctl (infd, SNDCTL_DSP_COOKEDMODE, &cookedmode); |
| 144 |
#endif |
| 145 |
} else if (driver->capture_channels == 0 && |
| 146 |
driver->playback_channels != 0) { |
| 147 |
@@ -510,7 +515,7 @@ static int oss_driver_start (oss_driver_ |
| 148 |
return -1; |
| 149 |
} |
| 150 |
#ifndef OSS_NO_COOKED_MODE |
| 151 |
- ioctl (outfd, SNDCTL_DSP_COOKEDMODE, &flags); |
| 152 |
+ ioctl (outfd, SNDCTL_DSP_COOKEDMODE, &cookedmode); |
| 153 |
#endif |
| 154 |
} else { |
| 155 |
infd = outfd = open (indev, O_RDWR | O_EXCL); |
| 156 |
@@ -521,7 +526,7 @@ static int oss_driver_start (oss_driver_ |
| 157 |
return -1; |
| 158 |
} |
| 159 |
#ifndef OSS_NO_COOKED_MODE |
| 160 |
- ioctl (infd, SNDCTL_DSP_COOKEDMODE, &flags); |
| 161 |
+ ioctl (infd, SNDCTL_DSP_COOKEDMODE, &cookedmode); |
| 162 |
#endif |
| 163 |
} |
| 164 |
if (infd >= 0 && outfd >= 0) { |
| 165 |
@@ -705,7 +710,9 @@ static int oss_driver_start (oss_driver_ |
| 108 |
sem_post (&driver->sem_start); |
166 |
sem_post (&driver->sem_start); |
| 109 |
} |
167 |
} |
| 110 |
|
168 |
|
|
Lines 115-121
Link Here
|
| 115 |
driver->next_periodtime = 0; |
173 |
driver->next_periodtime = 0; |
| 116 |
driver->iodelay = 0.0F; |
174 |
driver->iodelay = 0.0F; |
| 117 |
|
175 |
|
| 118 |
@@ -1143,6 +1146,23 @@ jack_driver_t * driver_initialize (jack_ |
176 |
@@ -1143,6 +1150,23 @@ jack_driver_t * driver_initialize (jack_ |
| 119 |
pnode = jack_slist_next (pnode); |
177 |
pnode = jack_slist_next (pnode); |
| 120 |
} |
178 |
} |
| 121 |
|
179 |
|
|
Lines 139-145
Link Here
|
| 139 |
driver->sample_rate = sample_rate; |
197 |
driver->sample_rate = sample_rate; |
| 140 |
driver->period_size = period_size; |
198 |
driver->period_size = period_size; |
| 141 |
driver->nperiods = nperiods; |
199 |
driver->nperiods = nperiods; |
| 142 |
@@ -1163,58 +1183,6 @@ jack_driver_t * driver_initialize (jack_ |
200 |
@@ -1163,58 +1187,6 @@ jack_driver_t * driver_initialize (jack_ |
| 143 |
} |
201 |
} |
| 144 |
driver->infd = -1; |
202 |
driver->infd = -1; |
| 145 |
driver->outfd = -1; |
203 |
driver->outfd = -1; |