aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAvuton Olrich <avuton@gmail.com>2006-08-11 21:50:56 +0000
committerAvuton Olrich <avuton@gmail.com>2006-08-11 21:50:56 +0000
commitca7fdaa92957ac452b57830a8c3606e3da29fe5b (patch)
tree3bf60c9e4e4b56e5ba1a479ff6810ce3c094f2b1
parent0cacc359439be8a1c6a69a31bbe26a3c835f692a (diff)
downloadmpd-ca7fdaa92957ac452b57830a8c3606e3da29fe5b.tar.gz
mpd-ca7fdaa92957ac452b57830a8c3606e3da29fe5b.tar.xz
mpd-ca7fdaa92957ac452b57830a8c3606e3da29fe5b.zip
Spelling & Grammar
git-svn-id: https://svn.musicpd.org/mpd/trunk@4612 09075e82-0dd4-0310-85a5-a0d7c8717e4f
-rw-r--r--src/audioOutput.c2
-rw-r--r--src/audioOutputs/audioOutput_osx.c4
-rw-r--r--src/audioOutputs/audioOutput_shout.c4
-rw-r--r--src/conf.c2
-rw-r--r--src/player.c2
-rw-r--r--src/tag.c2
-rw-r--r--src/volume.c2
7 files changed, 9 insertions, 9 deletions
diff --git a/src/audioOutput.c b/src/audioOutput.c
index 358947695..60ae9b772 100644
--- a/src/audioOutput.c
+++ b/src/audioOutput.c
@@ -59,7 +59,7 @@ void finishAudioOutputPlugins(void)
bp = getBlockParam(param, name); \
if(force && bp == NULL) { \
ERROR("couldn't find parameter \"%s\" in audio output " \
- "definition begining at %i\n", \
+ "definition beginning at %i\n", \
name, param->line); \
exit(EXIT_FAILURE); \
} \
diff --git a/src/audioOutputs/audioOutput_osx.c b/src/audioOutputs/audioOutput_osx.c
index 6f03c7cf7..d386bcbfc 100644
--- a/src/audioOutputs/audioOutput_osx.c
+++ b/src/audioOutputs/audioOutput_osx.c
@@ -245,7 +245,7 @@ static int osx_openDevice(AudioOutput * audioOutput)
if (AudioUnitInitialize(od->au) != 0) {
CloseComponent(od->au);
- ERROR("Unable to initialuze OS X audio unit\n");
+ ERROR("Unable to initialize OS X audio unit\n");
return -1;
}
@@ -257,7 +257,7 @@ static int osx_openDevice(AudioOutput * audioOutput)
&callback, sizeof(callback)) != 0) {
AudioUnitUninitialize(od->au);
CloseComponent(od->au);
- ERROR("unable to set callbak for OS X audio unit\n");
+ ERROR("unable to set callback for OS X audio unit\n");
return -1;
}
diff --git a/src/audioOutputs/audioOutput_shout.c b/src/audioOutputs/audioOutput_shout.c
index ab5a9b54c..5c268930a 100644
--- a/src/audioOutputs/audioOutput_shout.c
+++ b/src/audioOutputs/audioOutput_shout.c
@@ -423,7 +423,7 @@ static int initEncoder(ShoutData * sd)
sd->audioFormat->channels,
sd->audioFormat->sampleRate,
sd->quality * 0.1)) {
- ERROR("problem seting up vorbis encoder for shout\n");
+ ERROR("problem setting up vorbis encoder for shout\n");
vorbis_info_clear(&(sd->vi));
return -1;
}
@@ -432,7 +432,7 @@ static int initEncoder(ShoutData * sd)
sd->audioFormat->channels,
sd->audioFormat->sampleRate, -1.0,
sd->bitrate * 1000, -1.0)) {
- ERROR("problem seting up vorbis encoder for shout\n");
+ ERROR("problem setting up vorbis encoder for shout\n");
vorbis_info_clear(&(sd->vi));
return -1;
}
diff --git a/src/conf.c b/src/conf.c
index 54cb560b4..03680de82 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -233,7 +233,7 @@ static ConfigParam *readConfigBlock(FILE * fp, int *count, char *string)
0 == strcmp(array[1], CONF_BLOCK_END)) {
ERROR("improperly formatted config file at line %i:"
" %s\n", *count, string);
- ERROR("in block begining at line %i\n", ret->line);
+ ERROR("in block beginning at line %i\n", ret->line);
exit(EXIT_FAILURE);
}
diff --git a/src/player.c b/src/player.c
index faa05a32a..527e28aff 100644
--- a/src/player.c
+++ b/src/player.c
@@ -307,7 +307,7 @@ char *getPlayerErrorStr(void)
switch (pc->error) {
case PLAYER_ERROR_FILENOTFOUND:
snprintf(error, errorlen,
- "file \"%s\" does not exist or is inaccesible",
+ "file \"%s\" does not exist or is inaccessible",
pc->erroredUrl);
break;
case PLAYER_ERROR_FILE:
diff --git a/src/tag.c b/src/tag.c
index b4707d487..c01293b2c 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -414,7 +414,7 @@ MpdTag *apeDup(char *file)
if (readLEuint32(footer.version) != 2000)
goto fail;
- /* find begining of ape tag */
+ /* find beginning of ape tag */
tagLen = readLEuint32(footer.length);
if (tagLen < sizeof(footer))
goto fail;
diff --git a/src/volume.c b/src/volume.c
index 52ea571a5..ea9d1dd71 100644
--- a/src/volume.c
+++ b/src/volume.c
@@ -233,7 +233,7 @@ static int prepAlsaMixer(char *card)
if ((err = snd_mixer_attach(volume_alsaMixerHandle, card)) < 0) {
closeAlsaMixer();
- WARNING("problems problems attaching alsa mixer: %s\n",
+ WARNING("problems attaching alsa mixer: %s\n",
snd_strerror(err));
return -1;
}