MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-01-12 15:33:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

Proper update to libevent 2 in player.c

Browse Source
This commit is contained in:
ejurgensen 2014-09-28 22:09:22 +02:00
parent 965df4fdfc
commit 1ffbfd8c45
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/player.c
View File

@ -39,8 +39,10 @@
#ifdef HAVE_LIBEVENT2 #ifdef HAVE_LIBEVENT2
# include <event2/event.h> # include <event2/event.h>
# include <event2/buffer.h>
#else #else
# include <event.h> # include <event.h>
# define evbuffer_get_length(x) EVBUFFER_LENGTH(x)
#endif #endif
#include <gcrypt.h> #include <gcrypt.h>
@ -1601,7 +1603,7 @@ source_read(uint8_t *buf, int len, uint64_t rtptime)
return -1; return -1;
} }
if (EVBUFFER_LENGTH(audio_buf) == 0) if (evbuffer_get_length(audio_buf) == 0)
{ {
switch (cur_streaming->type) switch (cur_streaming->type)
{ {
@ -2209,7 +2211,7 @@ playback_abort(void)
cur_playing = NULL; cur_playing = NULL;
cur_streaming = NULL; cur_streaming = NULL;
evbuffer_drain(audio_buf, EVBUFFER_LENGTH(audio_buf)); evbuffer_drain(audio_buf, evbuffer_get_length(audio_buf));
status_update(PLAY_STOPPED); status_update(PLAY_STOPPED);
@ -2343,7 +2345,7 @@ playback_stop(struct player_command *cmd)
cur_playing = NULL; cur_playing = NULL;
cur_streaming = NULL; cur_streaming = NULL;
evbuffer_drain(audio_buf, EVBUFFER_LENGTH(audio_buf)); evbuffer_drain(audio_buf, evbuffer_get_length(audio_buf));
status_update(PLAY_STOPPED); status_update(PLAY_STOPPED);
@ -2839,7 +2841,7 @@ playback_pause(struct player_command *cmd)
cur_streaming = ps; cur_streaming = ps;
cur_streaming->play_next = NULL; cur_streaming->play_next = NULL;
evbuffer_drain(audio_buf, EVBUFFER_LENGTH(audio_buf)); evbuffer_drain(audio_buf, evbuffer_get_length(audio_buf));
metadata_purge(); metadata_purge();