diff options
| -rw-r--r-- | src/outputBuffer.c | 6 | ||||
| -rw-r--r-- | src/outputBuffer.h | 3 | ||||
| -rw-r--r-- | src/playlist.c | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/src/outputBuffer.c b/src/outputBuffer.c index d0a98b692..660067c27 100644 --- a/src/outputBuffer.c +++ b/src/outputBuffer.c @@ -125,12 +125,12 @@ int sendDataToOutputBuffer(OutputBuffer * cb, InputStream * inStream, return 0; } -void copyMpdTagToOutputBuffer(OutputBuffer * cb, MpdTag * tag) { +int copyMpdTagToOutputBuffer(OutputBuffer * cb, MpdTag * tag) { printf("copyMpdTagToOB called\n"); if(!cb->acceptMetadata || !tag) { sendMetaChunk = 0; - return; + return -1; } sendMetaChunk = 1; @@ -140,4 +140,6 @@ void copyMpdTagToOutputBuffer(OutputBuffer * cb, MpdTag * tag) { printMpdTag(stdout, tag); copyMpdTagToMetadataChunk(tag, &(cb->metadataChunks[currentMetaChunk])); + + return 0; } diff --git a/src/outputBuffer.h b/src/outputBuffer.h index a7e5bb171..421035c1e 100644 --- a/src/outputBuffer.h +++ b/src/outputBuffer.h @@ -41,6 +41,7 @@ typedef struct _OutputBuffer { mpd_sint8 volatile wrap; AudioFormat audioFormat; MetadataChunk metadataChunks[BUFFERED_METACHUNKS]; + mpd_sint8 metdataChunkSet[BUFFERED_METACHUNKS]; mpd_sint8 * volatile metaChunk; volatile mpd_sint8 acceptMetadata; } OutputBuffer; @@ -57,4 +58,6 @@ int sendDataToOutputBuffer(OutputBuffer * cb, InputStream * inStream, void copyMpdTagToOutputBuffer(OutputBuffer * cb, MpdTag * tag); +void zeroMetadataChunkSets(OutputBuffer * cb, int begin, int end, int wrap); + #endif diff --git a/src/playlist.c b/src/playlist.c index dd261cfd2..21ac024f6 100644 --- a/src/playlist.c +++ b/src/playlist.c @@ -533,7 +533,7 @@ int addToPlaylist(FILE * fp, char * url) { } else { commandError(fp, ACK_ERROR_NO_EXIST, - "\"%s\" is not in the music db or is" + "\"%s\" is not in the music db or is " "not a valid url\n", url); return -1; } |