MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-11-28 21:18:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'freebsd': New timing mechanism (issue #46)

Browse Source 
- also some libevent 2 adjustments
This commit is contained in:
ejurgensen
2014-09-30 21:39:02 +02:00
parent 376f0ed1c0 513e38dcda
commit 4857f21644
12 changed files with 263 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/artwork.c
View File

@@ -43,6 +43,10 @@
#endif
#include "artwork.h"
#ifndef HAVE_LIBEVENT2
# define evbuffer_get_length(x) (x)->off
#endif
#ifdef HAVE_SPOTIFY_H
# include "spotify.h"
#endif
@@ -717,8 +721,8 @@ artwork_get(char *filename, int max_w, int max_h, int format, struct evbuffer *e
if (ret < 0)
{
if (EVBUFFER_LENGTH(evbuf) > 0)
evbuffer_drain(evbuf, EVBUFFER_LENGTH(evbuf));
if (evbuffer_get_length(evbuf) > 0)
evbuffer_drain(evbuf, evbuffer_get_length(evbuf));
}
return ret;
@@ -830,8 +834,8 @@ artwork_get_embedded_image(char *filename, int max_w, int max_h, int format, str
if (ret < 0)
{
if (EVBUFFER_LENGTH(evbuf) > 0)
evbuffer_drain(evbuf, EVBUFFER_LENGTH(evbuf));
if (evbuffer_get_length(evbuf) > 0)
evbuffer_drain(evbuf, evbuffer_get_length(evbuf));
}
return ret;