aboutsummaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorths <ths@c046a42c-6fe2-441c-8c8c-71466251a162>2007-07-12 10:59:21 +0000
committerths <ths@c046a42c-6fe2-441c-8c8c-71466251a162>2007-07-12 10:59:21 +0000
commitfe8f096b16bf2328ec615d4314f06cd5545f32e5 (patch)
tree95689d472dfd63336af30ba6197a5714b3fc791e /audio
parent8fac5803a968b77fd59a2857f99e0894cc0a5b76 (diff)
Spelling fix, by Stuart Brady.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3076 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'audio')
-rw-r--r--audio/alsaaudio.c32
-rw-r--r--audio/audio.c8
-rw-r--r--audio/audio_int.h4
3 files changed, 22 insertions, 22 deletions
diff --git a/audio/alsaaudio.c b/audio/alsaaudio.c
index 3f9ffdbbcd..a573a380a3 100644
--- a/audio/alsaaudio.c
+++ b/audio/alsaaudio.c
@@ -50,11 +50,11 @@ static struct {
unsigned int period_size_out;
unsigned int threshold;
- int buffer_size_in_overriden;
- int period_size_in_overriden;
+ int buffer_size_in_overridden;
+ int period_size_in_overridden;
- int buffer_size_out_overriden;
- int period_size_out_overriden;
+ int buffer_size_out_overridden;
+ int period_size_out_overridden;
int verbose;
} conf = {
#define DEFAULT_BUFFER_SIZE 1024
@@ -75,10 +75,10 @@ static struct {
.period_size_in = DEFAULT_PERIOD_SIZE * 4,
.buffer_size_out = DEFAULT_BUFFER_SIZE,
.period_size_out = DEFAULT_PERIOD_SIZE,
- .buffer_size_in_overriden = 0,
- .buffer_size_out_overriden = 0,
- .period_size_in_overriden = 0,
- .period_size_out_overriden = 0,
+ .buffer_size_in_overridden = 0,
+ .buffer_size_out_overridden = 0,
+ .period_size_in_overridden = 0,
+ .period_size_out_overridden = 0,
#endif
.threshold = 0,
.verbose = 0
@@ -414,8 +414,8 @@ static int alsa_open (int in, struct alsa_params_req *req,
}
else {
if (period_size < minval) {
- if ((in && conf.period_size_in_overriden)
- || (!in && conf.period_size_out_overriden)) {
+ if ((in && conf.period_size_in_overridden)
+ || (!in && conf.period_size_out_overridden)) {
dolog ("%s period size(%d) is less "
"than minmal period size(%ld)\n",
typ,
@@ -450,8 +450,8 @@ static int alsa_open (int in, struct alsa_params_req *req,
}
else {
if (buffer_size < minval) {
- if ((in && conf.buffer_size_in_overriden)
- || (!in && conf.buffer_size_out_overriden)) {
+ if ((in && conf.buffer_size_in_overridden)
+ || (!in && conf.buffer_size_out_overridden)) {
dolog (
"%s buffer size(%d) is less "
"than minimal buffer size(%ld)\n",
@@ -945,16 +945,16 @@ static struct audio_option alsa_options[] = {
{"DAC_SIZE_IN_USEC", AUD_OPT_BOOL, &conf.size_in_usec_out,
"DAC period/buffer size in microseconds (otherwise in frames)", NULL, 0},
{"DAC_PERIOD_SIZE", AUD_OPT_INT, &conf.period_size_out,
- "DAC period size", &conf.period_size_out_overriden, 0},
+ "DAC period size", &conf.period_size_out_overridden, 0},
{"DAC_BUFFER_SIZE", AUD_OPT_INT, &conf.buffer_size_out,
- "DAC buffer size", &conf.buffer_size_out_overriden, 0},
+ "DAC buffer size", &conf.buffer_size_out_overridden, 0},
{"ADC_SIZE_IN_USEC", AUD_OPT_BOOL, &conf.size_in_usec_in,
"ADC period/buffer size in microseconds (otherwise in frames)", NULL, 0},
{"ADC_PERIOD_SIZE", AUD_OPT_INT, &conf.period_size_in,
- "ADC period size", &conf.period_size_in_overriden, 0},
+ "ADC period size", &conf.period_size_in_overridden, 0},
{"ADC_BUFFER_SIZE", AUD_OPT_INT, &conf.buffer_size_in,
- "ADC buffer size", &conf.buffer_size_in_overriden, 0},
+ "ADC buffer size", &conf.buffer_size_in_overridden, 0},
{"THRESHOLD", AUD_OPT_INT, &conf.threshold,
"(undocumented)", NULL, 0},
diff --git a/audio/audio.c b/audio/audio.c
index 5d3c7f15f0..4248c1401f 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -386,7 +386,7 @@ static void audio_print_options (const char *prefix,
const char *state = "default";
printf (" %s_%s: ", uprefix, opt->name);
- if (opt->overridenp && *opt->overridenp) {
+ if (opt->overriddenp && *opt->overriddenp) {
state = "current";
}
@@ -516,10 +516,10 @@ static void audio_process_options (const char *prefix,
break;
}
- if (!opt->overridenp) {
- opt->overridenp = &opt->overriden;
+ if (!opt->overriddenp) {
+ opt->overriddenp = &opt->overridden;
}
- *opt->overridenp = !def;
+ *opt->overriddenp = !def;
qemu_free (optname);
}
}
diff --git a/audio/audio_int.h b/audio/audio_int.h
index 1a15d4ced8..cd22a30880 100644
--- a/audio/audio_int.h
+++ b/audio/audio_int.h
@@ -44,8 +44,8 @@ struct audio_option {
audio_option_tag_e tag;
void *valp;
const char *descr;
- int *overridenp;
- int overriden;
+ int *overriddenp;
+ int overridden;
};
struct audio_callback {