Skip to content

Commit bda157c

Browse files
authored
Merge pull request tinyalsa#265 from erebion/master
Fixes for some typos
2 parents 41ebeda + db59fc8 commit bda157c

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

‎include/tinyalsa/pcm.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,8 @@
116116
*/
117117
#define PCM_STATE_RUNNING 0x03
118118

119-
/** For inputs, this means an overrun occured.
120-
* For outputs, this means an underrun occured.
119+
/** For inputs, this means an overrun occurred.
120+
* For outputs, this means an underrun occurred.
121121
*/
122122
#define PCM_STATE_XRUN 0x04
123123

‎src/mixer.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@ int mixer_subscribe_events(struct mixer *mixer, int subscribe)
477477

478478
/** Wait for mixer events.
479479
* @param mixer A mixer handle.
480-
* @param timeout timout value
480+
* @param timeout timeout value
481481
* @returns On success, 1.
482482
* On failure, -errno.
483483
* On timeout, 0

‎src/pcm.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -300,13 +300,13 @@ struct pcm {
300300
int fd;
301301
/** Flags that were passed to @ref pcm_open */
302302
unsigned int flags;
303-
/** The number of (under/over)runs that have occured */
303+
/** The number of (under/over)runs that have occurred */
304304
int xruns;
305305
/** Size of the buffer */
306306
unsigned int buffer_size;
307307
/** The boundary for ring buffer pointers */
308308
unsigned long boundary;
309-
/** Description of the last error that occured */
309+
/** Description of the last error that occurred */
310310
char error[PCM_ERROR_MAX];
311311
/** Configuration that was passed to @ref pcm_open */
312312
struct pcm_config config;
@@ -409,10 +409,10 @@ int pcm_get_file_descriptor(const struct pcm *pcm)
409409
return pcm->fd;
410410
}
411411

412-
/** Gets the error message for the last error that occured.
413-
* If no error occured and this function is called, the results are undefined.
412+
/** Gets the error message for the last error that occurred.
413+
* If no error occurred and this function is called, the results are undefined.
414414
* @param pcm A PCM handle.
415-
* @return The error message of the last error that occured.
415+
* @return The error message of the last error that occurred.
416416
* @ingroup libtinyalsa-pcm
417417
*/
418418
const char* pcm_get_error(const struct pcm *pcm)
@@ -1449,8 +1449,8 @@ int pcm_get_htimestamp(struct pcm *pcm, unsigned int *avail,
14491449
* @param pcm A PCM handle.
14501450
* @param timeout The maximum amount of time to wait for, in terms of milliseconds.
14511451
* @returns If frames became available, one is returned.
1452-
* If a timeout occured, zero is returned.
1453-
* If an error occured, a negative number is returned.
1452+
* If a timeout occurred, zero is returned.
1453+
* If an error occurred, a negative number is returned.
14541454
* @ingroup libtinyalsa-pcm
14551455
*/
14561456
int pcm_wait(struct pcm *pcm, int timeout)

0 commit comments

Comments
 (0)