diff options
| -rw-r--r-- | bs/config.mk.default | 3 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/metadata_pipe.c | 4 | ||||
| -rw-r--r-- | src/outputBuffer.c | 2 | ||||
| -rw-r--r-- | src/outputBuffer.h | 3 | ||||
| -rw-r--r-- | src/outputBuffer_ob_send.h | 2 | ||||
| -rw-r--r-- | src/playlist.h | 2 | ||||
| -rw-r--r-- | src/volume.c | 1 |
8 files changed, 13 insertions, 6 deletions
diff --git a/bs/config.mk.default b/bs/config.mk.default index 765cda236..52c5829d6 100644 --- a/bs/config.mk.default +++ b/bs/config.mk.default @@ -10,7 +10,8 @@ CC = gcc CFLAGS = -O2 -Wall \ -Wmissing-prototypes -Wextra -Wno-unused-parameter \ -Wno-deprecated-declarations -Wmissing-prototypes \ - -Wdeclaration-after-statement -Wshadow + -Wdeclaration-after-statement -Wshadow -Wpointer-arith \ + -Wstrict-prototypes -Wcast-qual -Wwrite-strings LDFLAGS = -Wl,-O1 diff --git a/configure.ac b/configure.ac index 5630fe650..c3db4cbc1 100644 --- a/configure.ac +++ b/configure.ac @@ -32,6 +32,8 @@ then MPD_CHECK_FLAG([-Wshadow]) MPD_CHECK_FLAG([-Wpointer-arith]) MPD_CHECK_FLAG([-Wstrict-prototypes]) + MPD_CHECK_FLAG([-Wcast-qual]) + MPD_CHECK_FLAG([-Wwrite-strings]) fi if test -z "$prefix" || test "x$prefix" = xNONE; then diff --git a/src/metadata_pipe.c b/src/metadata_pipe.c index 2bf730fef..d968dee27 100644 --- a/src/metadata_pipe.c +++ b/src/metadata_pipe.c @@ -24,10 +24,6 @@ #include "outputBuffer.h" #include "gcc.h" -/* These are defined in outputBuffer_accessors.h, cleanup is needed */ -mpd_uint8 ob_get_decoder_sequence(void); -mpd_uint8 ob_get_player_sequence(void); - static struct ringbuf *mp; /* Each one of these is a packet inside the metadata pipe */ diff --git a/src/outputBuffer.c b/src/outputBuffer.c index ec46417c6..ac0f420d8 100644 --- a/src/outputBuffer.c +++ b/src/outputBuffer.c @@ -28,6 +28,8 @@ #include "log.h" #include "action_status.h" #include "decode.h" +#include "metadata_pipe.h" +#include "playlist.h" /* typically have 2048-4096 of these structs, so pack tightly */ struct ob_chunk { diff --git a/src/outputBuffer.h b/src/outputBuffer.h index 3fc440af3..022f7ecdc 100644 --- a/src/outputBuffer.h +++ b/src/outputBuffer.h @@ -106,4 +106,7 @@ void ob_flush(void); void config_output_buffer(void); void init_output_buffer(void); +mpd_uint8 ob_get_decoder_sequence(void); + +mpd_uint8 ob_get_player_sequence(void); #endif diff --git a/src/outputBuffer_ob_send.h b/src/outputBuffer_ob_send.h index d2c99b3f2..310d5f8fd 100644 --- a/src/outputBuffer_ob_send.h +++ b/src/outputBuffer_ob_send.h @@ -122,7 +122,7 @@ ob_send(void *data, size_t len, start_playback(); return dc.action; } - data += c_len; + data = (unsigned char *)data + c_len; } } } diff --git a/src/playlist.h b/src/playlist.h index 0bcc9680a..629bfa057 100644 --- a/src/playlist.h +++ b/src/playlist.h @@ -128,4 +128,6 @@ void findSongsInPlaylist(int fd, int numItems, LocateTagItem * items); int valid_playlist_name(int err_fd, const char *utf8path); +struct mpd_tag *playlist_current_tag(void); + #endif diff --git a/src/volume.c b/src/volume.c index 791c1ea02..cf2b8eff8 100644 --- a/src/volume.c +++ b/src/volume.c @@ -24,6 +24,7 @@ #include "utils.h" #include "ack.h" #include "os_compat.h" +#include "outputBuffer.h" #include "../config.h" |