aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/user.xml2
-rw-r--r--src/archive_plugin.h2
-rw-r--r--src/audio_parser.h2
-rw-r--r--src/daemon.c2
-rw-r--r--src/encoder/flac_encoder.c2
-rw-r--r--src/encoder_plugin.h10
-rw-r--r--src/filter_plugin.h8
-rw-r--r--src/icy_server.c2
-rw-r--r--src/input_init.h2
-rw-r--r--src/input_plugin.h2
-rw-r--r--src/mixer_plugin.h8
-rw-r--r--src/output_plugin.h8
-rw-r--r--src/pcm_convert.h2
-rw-r--r--src/player_control.c2
-rw-r--r--src/player_thread.c2
-rw-r--r--src/playlist/lastfm_playlist_plugin.c2
-rw-r--r--src/server_socket.h6
-rw-r--r--src/socket_util.h4
-rw-r--r--src/song_save.h2
-rw-r--r--src/song_update.c2
-rw-r--r--src/sticker.h2
-rw-r--r--src/stored_playlist.h2
22 files changed, 38 insertions, 38 deletions
diff --git a/doc/user.xml b/doc/user.xml
index f24c7bdb4..ecf9a6637 100644
--- a/doc/user.xml
+++ b/doc/user.xml
@@ -356,7 +356,7 @@ cd mpd-version</programlisting>
If set to "yes", then MPD attempts to keep this audio
output always open. This may be useful for streaming
servers, when you don't want to disconnect all
- listeners even when playback is accidently stopped.
+ listeners even when playback is accidentally stopped.
</entry>
</row>
<row>
diff --git a/src/archive_plugin.h b/src/archive_plugin.h
index 3541cf9d3..7f038486b 100644
--- a/src/archive_plugin.h
+++ b/src/archive_plugin.h
@@ -68,7 +68,7 @@ struct archive_plugin {
* Opens an input_stream of a file within the archive.
*
* @param path the path within the archive
- * @param error_r location to store the error occuring, or
+ * @param error_r location to store the error occurring, or
* NULL to ignore errors
*/
struct input_stream *(*open_stream)(struct archive_file *af,
diff --git a/src/audio_parser.h b/src/audio_parser.h
index 526addca5..a963eb467 100644
--- a/src/audio_parser.h
+++ b/src/audio_parser.h
@@ -38,7 +38,7 @@ struct audio_format;
* @param dest the destination #audio_format struct
* @param src the input string
* @param mask if true, then "*" is allowed for any number of items
- * @param error_r location to store the error occuring, or NULL to
+ * @param error_r location to store the error occurring, or NULL to
* ignore errors
* @return true on success
*/
diff --git a/src/daemon.c b/src/daemon.c
index 89de9b9fb..8bca9095a 100644
--- a/src/daemon.c
+++ b/src/daemon.c
@@ -80,7 +80,7 @@ daemonize_kill(void)
ret = kill(pid, SIGTERM);
if (ret < 0)
- MPD_ERROR("unable to kill proccess %i: %s",
+ MPD_ERROR("unable to kill process %i: %s",
pid, g_strerror(errno));
exit(EXIT_SUCCESS);
diff --git a/src/encoder/flac_encoder.c b/src/encoder/flac_encoder.c
index a7d35597e..8b315d710 100644
--- a/src/encoder/flac_encoder.c
+++ b/src/encoder/flac_encoder.c
@@ -205,7 +205,7 @@ flac_encoder_open(struct encoder *_encoder, struct audio_format *audio_format,
pcm_buffer_init(&encoder->buffer);
pcm_buffer_init(&encoder->expand_buffer);
- /* this immediatelly outputs data throught callback */
+ /* this immediately outputs data through callback */
#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT <= 7
{
diff --git a/src/encoder_plugin.h b/src/encoder_plugin.h
index ba410c928..4a6e3805e 100644
--- a/src/encoder_plugin.h
+++ b/src/encoder_plugin.h
@@ -78,7 +78,7 @@ encoder_struct_init(struct encoder *encoder,
*
* @param plugin the encoder plugin
* @param param optional configuration
- * @param error location to store the error occuring, or NULL to ignore errors.
+ * @param error location to store the error occurring, or NULL to ignore errors.
* @return an encoder object on success, NULL on failure
*/
static inline struct encoder *
@@ -107,7 +107,7 @@ encoder_finish(struct encoder *encoder)
* @param encoder the encoder
* @param audio_format the encoder's input audio format; the plugin
* may modify the struct to adapt it to its abilities
- * @param error location to store the error occuring, or NULL to ignore errors.
+ * @param error location to store the error occurring, or NULL to ignore errors.
* @return true on success
*/
static inline bool
@@ -135,7 +135,7 @@ encoder_close(struct encoder *encoder)
* buffered available by encoder_read().
*
* @param encoder the encoder
- * @param error location to store the error occuring, or NULL to ignore errors.
+ * @param error location to store the error occurring, or NULL to ignore errors.
* @return true on success
*/
static inline bool
@@ -152,7 +152,7 @@ encoder_flush(struct encoder *encoder, GError **error)
*
* @param encoder the encoder
* @param tag the tag object
- * @param error location to store the error occuring, or NULL to ignore errors.
+ * @param error location to store the error occurring, or NULL to ignore errors.
* @return true on success
*/
static inline bool
@@ -170,7 +170,7 @@ encoder_tag(struct encoder *encoder, const struct tag *tag, GError **error)
* @param encoder the encoder
* @param data the buffer containing PCM samples
* @param length the length of the buffer in bytes
- * @param error location to store the error occuring, or NULL to ignore errors.
+ * @param error location to store the error occurring, or NULL to ignore errors.
* @return true on success
*/
static inline bool
diff --git a/src/filter_plugin.h b/src/filter_plugin.h
index d1e6433cf..58e34dfb2 100644
--- a/src/filter_plugin.h
+++ b/src/filter_plugin.h
@@ -79,7 +79,7 @@ struct filter_plugin {
*
* @param plugin the filter plugin
* @param param optional configuration section
- * @param error location to store the error occuring, or NULL to
+ * @param error location to store the error occurring, or NULL to
* ignore errors.
* @return a new filter object, or NULL on error
*/
@@ -92,7 +92,7 @@ filter_new(const struct filter_plugin *plugin,
* the specified configuration section.
*
* @param param the configuration section
- * @param error location to store the error occuring, or NULL to
+ * @param error location to store the error occurring, or NULL to
* ignore errors.
* @return a new filter object, or NULL on error
*/
@@ -114,7 +114,7 @@ filter_free(struct filter *filter);
* @param filter the filter object
* @param audio_format the audio format of incoming data; the plugin
* may modify the object to enforce another input format
- * @param error location to store the error occuring, or NULL to
+ * @param error location to store the error occurring, or NULL to
* ignore errors.
* @return the format of outgoing data
*/
@@ -137,7 +137,7 @@ filter_close(struct filter *filter);
* @param src the input buffer
* @param src_size the size of #src_buffer in bytes
* @param dest_size_r the size of the returned buffer
- * @param error location to store the error occuring, or NULL to
+ * @param error location to store the error occurring, or NULL to
* ignore errors.
* @return the destination buffer on success (will be invalidated by
* filter_close() or filter_filter()), NULL on error
diff --git a/src/icy_server.c b/src/icy_server.c
index fe5696cdd..b6c89eaf6 100644
--- a/src/icy_server.c
+++ b/src/icy_server.c
@@ -70,7 +70,7 @@ icy_server_metadata_string(const char *stream_title, const char* stream_url)
meta_length = strlen(icy_metadata);
- meta_length--; // substract placeholder
+ meta_length--; // subtract placeholder
meta_length = ((int)meta_length / 16) + 1;
diff --git a/src/input_init.h b/src/input_init.h
index f6763c3a8..ad92cda08 100644
--- a/src/input_init.h
+++ b/src/input_init.h
@@ -28,7 +28,7 @@
/**
* Initializes this library and all input_stream implementations.
*
- * @param error_r location to store the error occuring, or NULL to
+ * @param error_r location to store the error occurring, or NULL to
* ignore errors
*/
bool
diff --git a/src/input_plugin.h b/src/input_plugin.h
index bfd2be65b..70b9155aa 100644
--- a/src/input_plugin.h
+++ b/src/input_plugin.h
@@ -35,7 +35,7 @@ struct input_plugin {
/**
* Global initialization. This method is called when MPD starts.
*
- * @param error_r location to store the error occuring, or
+ * @param error_r location to store the error occurring, or
* NULL to ignore errors
* @return true on success, false if the plugin should be
* disabled
diff --git a/src/mixer_plugin.h b/src/mixer_plugin.h
index 755591d7b..9532b95cb 100644
--- a/src/mixer_plugin.h
+++ b/src/mixer_plugin.h
@@ -41,7 +41,7 @@ struct mixer_plugin {
* @param ao the pointer returned by audio_output_plugin.init
* @param param the configuration section, or NULL if there is
* no configuration
- * @param error_r location to store the error occuring, or
+ * @param error_r location to store the error occurring, or
* NULL to ignore errors
* @return a mixer object, or NULL on error
*/
@@ -56,7 +56,7 @@ struct mixer_plugin {
/**
* Open mixer device
*
- * @param error_r location to store the error occuring, or
+ * @param error_r location to store the error occurring, or
* NULL to ignore errors
* @return true on success, false on error
*/
@@ -70,7 +70,7 @@ struct mixer_plugin {
/**
* Reads the current volume.
*
- * @param error_r location to store the error occuring, or
+ * @param error_r location to store the error occurring, or
* NULL to ignore errors
* @return the current volume (0..100 including) or -1 if
* unavailable or on error (error_r set, mixer will be closed)
@@ -80,7 +80,7 @@ struct mixer_plugin {
/**
* Sets the volume.
*
- * @param error_r location to store the error occuring, or
+ * @param error_r location to store the error occurring, or
* NULL to ignore errors
* @param volume the new volume (0..100 including)
* @return true on success, false on error
diff --git a/src/output_plugin.h b/src/output_plugin.h
index 1611a3cb6..72b519d13 100644
--- a/src/output_plugin.h
+++ b/src/output_plugin.h
@@ -52,7 +52,7 @@ struct audio_output_plugin {
* none is configured
* @param param the configuration section, or NULL if there is
* no configuration
- * @param error location to store the error occuring, or NULL
+ * @param error location to store the error occurring, or NULL
* to ignore errors
* @return NULL on error, or an opaque pointer to the plugin's
* data
@@ -72,7 +72,7 @@ struct audio_output_plugin {
* fail: if an error occurs during that, it should be reported
* by the open() method.
*
- * @param error_r location to store the error occuring, or
+ * @param error_r location to store the error occurring, or
* NULL to ignore errors
* @return true on success, false on error
*/
@@ -89,7 +89,7 @@ struct audio_output_plugin {
*
* @param audio_format the audio format in which data is going
* to be delivered; may be modified by the plugin
- * @param error location to store the error occuring, or NULL
+ * @param error location to store the error occurring, or NULL
* to ignore errors
*/
bool (*open)(void *data, struct audio_format *audio_format,
@@ -119,7 +119,7 @@ struct audio_output_plugin {
/**
* Play a chunk of audio data.
*
- * @param error location to store the error occuring, or NULL
+ * @param error location to store the error occurring, or NULL
* to ignore errors
* @return the number of bytes played, or 0 on error
*/
diff --git a/src/pcm_convert.h b/src/pcm_convert.h
index 5f1134396..6dbd7541b 100644
--- a/src/pcm_convert.h
+++ b/src/pcm_convert.h
@@ -75,7 +75,7 @@ void pcm_convert_deinit(struct pcm_convert_state *state);
* @param src_size the size of #src in bytes
* @param dest_format the requested destination audio format
* @param dest_size_r returns the number of bytes of the destination buffer
- * @param error_r location to store the error occuring, or NULL to
+ * @param error_r location to store the error occurring, or NULL to
* ignore errors
* @return the destination buffer, or NULL on error
*/
diff --git a/src/player_control.c b/src/player_control.c
index 0f73c929a..51420a43f 100644
--- a/src/player_control.c
+++ b/src/player_control.c
@@ -281,7 +281,7 @@ pc_get_error_message(struct player_control *pc)
return g_strdup("problems opening audio device");
case PLAYER_ERROR_SYSTEM:
- return g_strdup("system error occured");
+ return g_strdup("system error occurred");
case PLAYER_ERROR_UNKTYPE:
uri = pc_errored_song_uri(pc);
diff --git a/src/player_thread.c b/src/player_thread.c
index 48225706b..d47c5c851 100644
--- a/src/player_thread.c
+++ b/src/player_thread.c
@@ -112,7 +112,7 @@ struct player {
* output thread. This attribute is only used if
* audio_output_all_get_elapsed_time() didn't return a usable
* value; the output thread can estimate the elapsed time more
- * precisly.
+ * precisely.
*/
float elapsed_time;
};
diff --git a/src/playlist/lastfm_playlist_plugin.c b/src/playlist/lastfm_playlist_plugin.c
index 41332f559..5c803cd99 100644
--- a/src/playlist/lastfm_playlist_plugin.c
+++ b/src/playlist/lastfm_playlist_plugin.c
@@ -139,7 +139,7 @@ lastfm_get(const char *url)
* Ini-style value fetcher.
* @param response data through which to search.
* @param name name of value to search for.
- * @return value for param name in param reponse or NULL on error. Free with g_free.
+ * @return value for param name in param response or NULL on error. Free with g_free.
*/
static char *
lastfm_find(const char *response, const char *name)
diff --git a/src/server_socket.h b/src/server_socket.h
index b02b2f4ce..e5777f7b3 100644
--- a/src/server_socket.h
+++ b/src/server_socket.h
@@ -47,7 +47,7 @@ server_socket_close(struct server_socket *ss);
* Add a listener on a port on all interfaces.
*
* @param port the TCP port
- * @param error_r location to store the error occuring, or NULL to
+ * @param error_r location to store the error occurring, or NULL to
* ignore errors
* @return true on success
*/
@@ -61,7 +61,7 @@ server_socket_add_port(struct server_socket *ss, unsigned port,
*
* @param hostname the host name to be resolved
* @param port the TCP port
- * @param error_r location to store the error occuring, or NULL to
+ * @param error_r location to store the error occurring, or NULL to
* ignore errors
* @return true on success
*/
@@ -73,7 +73,7 @@ server_socket_add_host(struct server_socket *ss, const char *hostname,
* Add a listener on a Unix domain socket.
*
* @param path the absolute socket path
- * @param error_r location to store the error occuring, or NULL to
+ * @param error_r location to store the error occurring, or NULL to
* ignore errors
* @return true on success
*/
diff --git a/src/socket_util.h b/src/socket_util.h
index c53a45cf6..3ebf4084c 100644
--- a/src/socket_util.h
+++ b/src/socket_util.h
@@ -37,7 +37,7 @@ struct sockaddr;
*
* @param sa the sockaddr struct
* @param length the length of #sa in bytes
- * @param error location to store the error occuring, or NULL to
+ * @param error location to store the error occurring, or NULL to
* ignore errors
*/
char *
@@ -53,7 +53,7 @@ sockaddr_to_string(const struct sockaddr *sa, size_t length, GError **error);
* @param address the address to listen on
* @param address_length the size of #address
* @param backlog the backlog parameter for the listen() system call
- * @param error location to store the error occuring, or NULL to
+ * @param error location to store the error occurring, or NULL to
* ignore errors
* @return the socket file descriptor or -1 on error
*/
diff --git a/src/song_save.h b/src/song_save.h
index efa286c50..1aaa7642c 100644
--- a/src/song_save.h
+++ b/src/song_save.h
@@ -40,7 +40,7 @@ songvec_save(FILE *fp, const struct songvec *sv);
* Loads a song from the input file. Reading stops after the
* "song_end" line.
*
- * @param error_r location to store the error occuring, or NULL to
+ * @param error_r location to store the error occurring, or NULL to
* ignore errors
* @return true on success, false on error
*/
diff --git a/src/song_update.c b/src/song_update.c
index 148ca0d3b..e2a845eef 100644
--- a/src/song_update.c
+++ b/src/song_update.c
@@ -190,7 +190,7 @@ song_file_update_inarchive(struct song *song)
tag_free(song->tag);
//accept every file that has music suffix
- //because we dont support tag reading throught
+ //because we don't support tag reading through
//input streams
song->tag = tag_new();
diff --git a/src/sticker.h b/src/sticker.h
index 0dc74b162..5545206a5 100644
--- a/src/sticker.h
+++ b/src/sticker.h
@@ -51,7 +51,7 @@ struct sticker;
/**
* Opens the sticker database (if path is not NULL).
*
- * @param error_r location to store the error occuring, or NULL to
+ * @param error_r location to store the error occurring, or NULL to
* ignore errors
* @return true on success, false on error
*/
diff --git a/src/stored_playlist.h b/src/stored_playlist.h
index 0eaf64d4c..b1fdb6f85 100644
--- a/src/stored_playlist.h
+++ b/src/stored_playlist.h
@@ -51,7 +51,7 @@ spl_valid_name(const char *name_utf8);
/**
* Returns a list of stored_playlist_info struct pointers. Returns
- * NULL if an error occured.
+ * NULL if an error occurred.
*/
GPtrArray *
spl_list(void);