Deleted Added
sdiff udiff text old ( 227255 ) new ( 230611 )
full compact
mixer.c (227255) mixer.c (230611)
1/*
2 * This is an example of a mixer program for Linux
3 *
4 * updated 1/1/93 to add stereo, level query, broken
5 * devmask kludge - cmetz@thor.tjhsst.edu
6 *
7 * (C) Craig Metz and Hannu Savolainen 1993.
8 *
9 * You may do anything you wish with this program.
10 *
11 * ditto for my modifications (John-Mark Gurney, 1997)
12 */
13
14#include <sys/cdefs.h>
1/*
2 * This is an example of a mixer program for Linux
3 *
4 * updated 1/1/93 to add stereo, level query, broken
5 * devmask kludge - cmetz@thor.tjhsst.edu
6 *
7 * (C) Craig Metz and Hannu Savolainen 1993.
8 *
9 * You may do anything you wish with this program.
10 *
11 * ditto for my modifications (John-Mark Gurney, 1997)
12 */
13
14#include <sys/cdefs.h>
15__FBSDID("$FreeBSD: head/usr.sbin/mixer/mixer.c 227255 2011-11-06 19:02:13Z ed $");
15__FBSDID("$FreeBSD: head/usr.sbin/mixer/mixer.c 230611 2012-01-27 09:15:55Z mav $");
16
17#include <err.h>
18#include <fcntl.h>
19#include <libgen.h>
20#include <limits.h>
21#include <stdio.h>
22#include <string.h>
23#include <stdlib.h>

--- 164 unchanged lines hidden (view full) ---

188
189 n = 0;
190 while (argc > 0 && dusage == 0) {
191 if (strcmp("recsrc", *argv) == 0) {
192 drecsrc = 1;
193 argc--;
194 argv++;
195 continue;
16
17#include <err.h>
18#include <fcntl.h>
19#include <libgen.h>
20#include <limits.h>
21#include <stdio.h>
22#include <string.h>
23#include <stdlib.h>

--- 164 unchanged lines hidden (view full) ---

188
189 n = 0;
190 while (argc > 0 && dusage == 0) {
191 if (strcmp("recsrc", *argv) == 0) {
192 drecsrc = 1;
193 argc--;
194 argv++;
195 continue;
196 } else if (argc > 1 && strcmp("rec", *argv + 1) == 0) {
196 } else if (strcmp("rec", *argv + 1) == 0) {
197 if (**argv != '+' && **argv != '-' &&
198 **argv != '=' && **argv != '^') {
199 warnx("unknown modifier: %c", **argv);
200 dusage = 1;
201 break;
202 }
197 if (**argv != '+' && **argv != '-' &&
198 **argv != '=' && **argv != '^') {
199 warnx("unknown modifier: %c", **argv);
200 dusage = 1;
201 break;
202 }
203 if (argc <= 1) {
204 warnx("no recording device specified");
205 dusage = 1;
206 break;
207 }
203 if ((dev = res_name(argv[1], recmask)) == -1) {
204 warnx("unknown recording device: %s", argv[1]);
205 dusage = 1;
206 break;
207 }
208 switch (**argv) {
209 case '+':
210 recsrc |= (1 << dev);

--- 121 unchanged lines hidden --- 		208 if ((dev = res_name(argv[1], recmask)) == -1) {
209 warnx("unknown recording device: %s", argv[1]);
210 dusage = 1;
211 break;
212 }
213 switch (**argv) {
214 case '+':
215 recsrc |= (1 << dev);

--- 121 unchanged lines hidden ---