Skip to content

Commit

Permalink
Merge remote-tracking branch 'mpg123/master' into master-with-github-ci
Browse files Browse the repository at this point in the history
  • Loading branch information
mpg123 GitHub bot committed Aug 7, 2024
2 parents 8f12789 + 6c9a4dc commit b66125f
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 7 deletions.
1 change: 1 addition & 0 deletions NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
------
- ports/cmake: Work around bug in CMake that does not detect FPU on
Apple ARM CPUs (github PR 14).
- Fix some laziness (func() to func(void)) for standards conformance.

1.32.6
------
Expand Down
2 changes: 1 addition & 1 deletion src/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,7 @@ void print_stat(mpg123_handle *fr, long offset, out123_handle *ao, int draw_bar
free(line);
}

void clear_stat()
void clear_stat(void)
{
int len = term_width(STDERR_FILENO);
if(len > 0)
Expand Down
2 changes: 1 addition & 1 deletion src/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ void print_header_compact(mpg123_handle *);
void print_stat(mpg123_handle *fr, long offset, out123_handle *ao, int draw_bar
, struct parameter *param);
void print_buf(const char* prefix, out123_handle *ao);
void clear_stat();
void clear_stat(void);
// input: decoder and output handle, frame offset
// output: frames, frames_remain, seconds, seconds_remain, seconds_buffered, seconds_total
int position_info( mpg123_handle *, off_t, out123_handle *, off_t *, off_t *, double *, double *, double *, double *);
Expand Down
2 changes: 1 addition & 1 deletion src/httpget.c
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ int translate_url(const char *url, mpg123_string *purl)
* 2000-10-21:
* We would like spaces to be automatically converted to %20's when
* fetching via HTTP.
* -- Martin Sjögren <[email protected]>
* -- Martin Sjoegren <[email protected]>
* Hm, why only spaces? Maybe one should do this http stuff more properly...
*/
if ((sptr = strchr(url, ' ')) == NULL)
Expand Down
2 changes: 1 addition & 1 deletion src/mpg123.c
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ static size_t prebuffer_size = 0;
static size_t prebuffer_fill = 0;
static size_t minbytes = 0;

void set_intflag()
void set_intflag(void)
{
debug("set_intflag TRUE");
intflag = TRUE;
Expand Down
2 changes: 1 addition & 1 deletion src/mpg123app.h
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ extern int playlimit;
#endif

/* why extern? */
void play_prebuffer();
void play_prebuffer(void);
extern int play_frame(void);

extern int control_generic(mpg123_handle *fr);
Expand Down
2 changes: 1 addition & 1 deletion src/playlist.c
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ static void init_playlist(void)
pl.stdin_used = FALSE;
}

int playlist_stdin()
int playlist_stdin(void)
{
return pl.stdin_used;
}
Expand Down
2 changes: 1 addition & 1 deletion src/playlist.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
/* create playlist from argv including reading of playlist file */
void prepare_playlist(int argc, char** argv, int args_utf8, int *is_utf8);
/* Return TRUE if standard put is used up by the playlist. */
int playlist_stdin();
int playlist_stdin(void);
/* returns the next url to play or NULL when there is none left */
char *get_next_file(void);
/* Get current track number, optionally the total count and loop counter. */
Expand Down

0 comments on commit b66125f

Please sign in to comment.