Skip to content

Commit

Permalink
Spelling, grammar, and other improvements (cmus#1024)
Browse files Browse the repository at this point in the history
* Fix spelling mistakes

* Started editing cmus.txt

* More stuff

* More edits

* A few minor improvements

* Add myself to the manpage authors

* Fix typo
  • Loading branch information
pgaskin authored Jan 12, 2021
1 parent c572b1e commit 3511023
Show file tree
Hide file tree
Showing 12 changed files with 400 additions and 449 deletions.
799 changes: 375 additions & 424 deletions Doc/cmus.txt

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,14 +86,14 @@ To subscribe to [email protected] or view the archive visit
http://lists.sourceforge.net/lists/listinfo/cmus-devel.

The mailing list now serves as an archive for old releases and issues.
Please use the github [issues](https://github.com/cmus/cmus/issues)
Please use the GitHub [issues](https://github.com/cmus/cmus/issues)
page for any problems, suggestions, or bug reports.


Reporting Bugs
--------------

Bugs should be reported using the Github [issue tracker](https://github.com/cmus/cmus/issues).
Bugs should be reported using the GitHub [issue tracker](https://github.com/cmus/cmus/issues).
When creating a new issue, a template will be shown containing instructions on how to collect
the necessary information.

Expand All @@ -117,5 +117,5 @@ Use hard tabs. Tabs are _always_ 8 characters wide. Keep the style consistent
code.

Bug fixes and implementations of new features should be suggested as a
[pull request](https://github.com/cmus/cmus/pulls) directly on Github.
[pull request](https://github.com/cmus/cmus/pulls) directly on GitHub.

2 changes: 1 addition & 1 deletion glob.c
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ static int do_glob_match(struct list_head *head, struct list_head *first, const
} else if (gitem->type == GLOB_STAR) {
/* after star there MUST be normal text (or nothing),
* question marks have been moved before this star and
* other stars have been sripped (see simplify)
* other stars have been stripped (see simplify)
*/
struct list_head *next;
struct glob_item *next_gi;
Expand Down
2 changes: 1 addition & 1 deletion id3.c
Original file line number Diff line number Diff line change
Expand Up @@ -1036,7 +1036,7 @@ static void unsync(unsigned char *buf, int *lenp)
if (s < len)
buf[d++] = buf[s++];

d_print("unsyncronization removed %d bytes\n", s - d);
d_print("de-synchronization removed %d bytes\n", s - d);
*lenp = d;
}

Expand Down
2 changes: 1 addition & 1 deletion lib.c
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ static int is_filtered(struct track_info *ti)
void lib_add_track(struct track_info *ti, void *opaque)
{
if (add_filter && !expr_eval(add_filter, ti)) {
/* filter any files exluded by lib_add_filter */
/* filter any files excluded by lib_add_filter */
return;
}

Expand Down
8 changes: 4 additions & 4 deletions list.h
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ static inline void list_del_init(struct list_head *entry)
}

/**
* list_move - delete from one list and add as another's head
* list_move - delete from one list and add as another one's head
* @list: the entry to move
* @head: the head that will precede our entry
*/
Expand All @@ -157,7 +157,7 @@ static inline void list_move(struct list_head *list, struct list_head *head)
}

/**
* list_move_tail - delete from one list and add as another's tail
* list_move_tail - delete from one list and add as another one's tail
* @list: the entry to move
* @head: the head that will follow our entry
*/
Expand Down Expand Up @@ -203,11 +203,11 @@ static inline void list_splice(struct list_head *list, struct list_head *head)
}

/**
* list_splice_init - join two lists and reinitialise the emptied list.
* list_splice_init - join two lists and reinitialize the emptied list.
* @list: the new list to add.
* @head: the place to add it in the first list.
*
* The list at @list is reinitialised
* The list at @list is reinitialized
*/
static inline void list_splice_init(struct list_head *list,
struct list_head *head)
Expand Down
12 changes: 6 additions & 6 deletions op/coreaudio.c
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ static AudioStreamBasicDescription coreaudio_format_description;
static AudioUnit coreaudio_audio_unit = NULL;
static UInt32 coreaudio_buffer_frame_size = 1;
static coreaudio_ring_buffer_t coreaudio_ring_buffer = {0, 0, 0, 0, 0, NULL};
static UInt32 coreaudio_stero_channels[2];
static UInt32 coreaudio_stereo_channels[2];
static int coreaudio_mixer_pipe_in = 0;
static int coreaudio_mixer_pipe_out = 0;

Expand Down Expand Up @@ -751,7 +751,7 @@ static int coreaudio_mixer_set_volume(int l, int r)
AudioObjectPropertyAddress aopa = {
.mSelector = kAudioDevicePropertyVolumeScalar,
.mScope = kAudioObjectPropertyScopeOutput,
.mElement = coreaudio_stero_channels[i]
.mElement = coreaudio_stereo_channels[i]
};

UInt32 size = sizeof(vol[i]);
Expand All @@ -778,7 +778,7 @@ static int coreaudio_mixer_get_volume(int *l, int *r)
AudioObjectPropertyAddress aopa = {
.mSelector = kAudioDevicePropertyVolumeScalar,
.mScope = kAudioObjectPropertyScopeOutput,
.mElement = coreaudio_stero_channels[i]
.mElement = coreaudio_stereo_channels[i]
};
UInt32 size = sizeof(vol[i]);
err |= AudioObjectGetPropertyData(coreaudio_device_id,
Expand Down Expand Up @@ -808,7 +808,7 @@ static int coreaudio_mixer_get_volume(int *l, int *r)
static int coreaudio_mixer_open(int *volume_max)
{
*volume_max = coreaudio_max_volume;
OSStatus err = coreaudio_get_device_stereo_channels(coreaudio_device_id, coreaudio_stero_channels);
OSStatus err = coreaudio_get_device_stereo_channels(coreaudio_device_id, coreaudio_stereo_channels);
if (err != noErr) {
d_print("Cannot get channel information: %d\n", err);
errno = ENODEV;
Expand All @@ -818,7 +818,7 @@ static int coreaudio_mixer_open(int *volume_max)
AudioObjectPropertyAddress aopa = {
.mSelector = kAudioDevicePropertyVolumeScalar,
.mScope = kAudioObjectPropertyScopeOutput,
.mElement = coreaudio_stero_channels[i]
.mElement = coreaudio_stereo_channels[i]
};
err |= AudioObjectAddPropertyListener(coreaudio_device_id,
&aopa,
Expand All @@ -841,7 +841,7 @@ static int coreaudio_mixer_close(void)
AudioObjectPropertyAddress aopa = {
.mSelector = kAudioDevicePropertyVolumeScalar,
.mScope = kAudioObjectPropertyScopeOutput,
.mElement = coreaudio_stero_channels[i]
.mElement = coreaudio_stereo_channels[i]
};

err |= AudioObjectRemovePropertyListener(coreaudio_device_id,
Expand Down
8 changes: 4 additions & 4 deletions op/jack.c
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ static int op_jack_cb(jack_nframes_t frames, void *arg)
}
}

/* if there is less than frames awaylable play silence */
/* if there is less than frames available play silence */
if (paused || bytes_min < bytes_want) {
for (int i = 0; i < CHANNELS; i++) {
jack_default_audio_sample_t* jack_buf = jack_port_get_buffer(output_ports[i], frames);
Expand Down Expand Up @@ -214,7 +214,7 @@ static int op_jack_buffer_init(jack_nframes_t samples, void *arg)
if (ringbuffer[i] != NULL) {
size_t length = jack_ringbuffer_read_space(ringbuffer[i]);

/* actualy this could both read/write less than length.
/* actually this could both read/write less than length.
* In that case, which should not happen[TM], there will
* be a gap in playback.
*/
Expand Down Expand Up @@ -279,7 +279,7 @@ static int op_jack_init(void)
jack_options_t options = JackNullOption;
if (fail) {
/* since jackd failed, it will not be autostarted. Either jackd
* was killed intentionaly or it died by heartattack.
* was killed intentionally or it died by heartattack.
* Until it is restarted, init will happily fail again
* and again and again..
*/
Expand Down Expand Up @@ -340,7 +340,7 @@ static int op_jack_init(void)
break;
}
if (jack_connect(client, jack_port_name(output_ports[i]), ports[i])) {
d_print("connot connect port %s\n", ports[i]);
d_print("cannot connect port %s\n", ports[i]);
jack_free(ports);
return -OP_ERROR_INTERNAL;
}
Expand Down
4 changes: 2 additions & 2 deletions tabexp_file.c
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ static void tabexp_load_dir(const char *dirname, const char *start,
{
PTR_ARRAY(array);

/* tabexp is reseted */
/* tabexp is reset */
load_dir(&array, dirname, start, filter);

if (array.count) {
Expand All @@ -149,7 +149,7 @@ static void tabexp_load_env_path(const char *env_path, const char *start,
char cwd[1024];
char *p = path, *n;

/* tabexp is reseted */
/* tabexp is reset */
do {
n = strchr(p, ':');
if (n)
Expand Down
2 changes: 1 addition & 1 deletion track_info.c
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ static int doublecmp0(double a, double b)
return (x > 0) - (x < 0);
}

/* this function gets called *alot*, it must be very fast */
/* this function gets called *a lot*, it must be very fast */
int track_info_cmp(const struct track_info *a, const struct track_info *b, const sort_key_t *keys)
{
int i, rev = 0, res = 0;
Expand Down
2 changes: 1 addition & 1 deletion uchar.c
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ void u_prev_char_pos(const char *str, int *idx)
ch = s[--i];
len = len_tab[ch];
if (len != 0) {
/* start of byte sequence or invelid uchar */
/* start of byte sequence or invalid uchar */
goto one;
}

Expand Down
2 changes: 1 addition & 1 deletion window.c
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@ void window_set_sel(struct window *win, struct iter *iter)

tmp = win->sel;
bottom_nr = sel_nr;
if (sel_nr >= top_nr + win->nr_rows) { /* seleced element not visible */
if (sel_nr >= top_nr + win->nr_rows) { /* selected element not visible */
while (sel_nr >= top_nr + win->nr_rows) {
win->get_next(&win->top);
top_nr++;
Expand Down

0 comments on commit 3511023

Please sign in to comment.