MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-02-04 10:26:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

Make raop_metadata_free private again and change a comment in http.c

Browse Source
This commit is contained in:
ejurgensen 2015-04-11 20:53:09 +02:00
parent 99cda05dab
commit 7d756230c2
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/http.c
View File

@ -484,7 +484,7 @@ http_icy_metadata_get(AVFormatContext *fmtctx, int packet_only)
* headers, so we must instead open the stream ourselves to get the metadata. * headers, so we must instead open the stream ourselves to get the metadata.
* Sorry about the extra connections, you radio streaming people! * Sorry about the extra connections, you radio streaming people!
* *
* TODO: Get packet metadata from fmtctx->packet_buffer * It is not possible to get the packet metadata with these versions of ffmpeg
*/ */
struct http_icy_metadata * struct http_icy_metadata *
http_icy_metadata_get(AVFormatContext *fmtctx, int packet_only) http_icy_metadata_get(AVFormatContext *fmtctx, int packet_only)
@ -496,7 +496,7 @@ http_icy_metadata_get(AVFormatContext *fmtctx, int packet_only)
int got_header; int got_header;
int ret; int ret;
/* Can only get header metadata at the moment */ /* Can only get header metadata */
if (packet_only) if (packet_only)
return NULL; return NULL;

2
src/raop.c
View File

@ -708,7 +708,7 @@ raop_crypt_encrypt_aes_key_base64(void)
/* RAOP metadata */ /* RAOP metadata */
void static void
raop_metadata_free(struct raop_metadata *rmd) raop_metadata_free(struct raop_metadata *rmd)
{ {
evbuffer_free(rmd->metadata); evbuffer_free(rmd->metadata);

3
src/raop.h
View File

@ -91,9 +91,6 @@ enum raop_session_state
typedef void (*raop_status_cb)(struct raop_device *dev, struct raop_session *rs, enum raop_session_state status); typedef void (*raop_status_cb)(struct raop_device *dev, struct raop_session *rs, enum raop_session_state status);
void
raop_metadata_free(struct raop_metadata *rmd);
void void
raop_metadata_purge(void); raop_metadata_purge(void);