MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-03-20 12:34:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add a timeout waiting for audio to Spotify

Browse Source
This commit is contained in:
ejurgensen 2014-11-11 11:59:40 +01:00
parent f74774f5f7
commit 5e4f449179
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/spotify.c
View File

@ -46,6 +46,9 @@
#include "filescanner.h" #include "filescanner.h"
/* How long to wait for audio (in sec) before giving up */
#define SPOTIFY_TIMEOUT 30
/* --- Types --- */ /* --- Types --- */
typedef struct audio_fifo_data typedef struct audio_fifo_data
{ {
@ -951,6 +954,7 @@ audio_get(struct spotify_command *cmd)
struct timespec ts; struct timespec ts;
audio_fifo_data_t *afd; audio_fifo_data_t *afd;
int processed; int processed;
int timeout;
int ret; int ret;
int s; int s;
@ -975,9 +979,11 @@ audio_get(struct spotify_command *cmd)
// If buffer is empty, wait for audio, but use timed wait so we don't // If buffer is empty, wait for audio, but use timed wait so we don't
// risk waiting forever (maybe the player stopped while we were waiting) // risk waiting forever (maybe the player stopped while we were waiting)
timeout = 0;
while ( !(afd = TAILQ_FIRST(&g_audio_fifo->q)) && while ( !(afd = TAILQ_FIRST(&g_audio_fifo->q)) &&
(g_state != SPOTIFY_STATE_STOPPED) && (g_state != SPOTIFY_STATE_STOPPED) &&
(g_state != SPOTIFY_STATE_STOPPING) ) (g_state != SPOTIFY_STATE_STOPPING) &&
(timeout < SPOTIFY_TIMEOUT) )
{ {
DPRINTF(E_DBG, L_SPOTIFY, "Waiting for audio\n"); DPRINTF(E_DBG, L_SPOTIFY, "Waiting for audio\n");
#if _POSIX_TIMERS > 0 #if _POSIX_TIMERS > 0
@ -988,10 +994,18 @@ audio_get(struct spotify_command *cmd)
TIMEVAL_TO_TIMESPEC(&tv, &ts); TIMEVAL_TO_TIMESPEC(&tv, &ts);
#endif #endif
ts.tv_sec += 5; ts.tv_sec += 5;
timeout += 5;
pthread_cond_timedwait(&g_audio_fifo->cond, &g_audio_fifo->mutex, &ts); pthread_cond_timedwait(&g_audio_fifo->cond, &g_audio_fifo->mutex, &ts);
} }
if ((!afd) && (timeout >= SPOTIFY_TIMEOUT))
{
DPRINTF(E_LOG, L_SPOTIFY, "Timeout waiting for audio (waited %d sec)\n", timeout);
spotify_playback_stop_nonblock();
}
if (!afd) if (!afd)
break; break;
@ -1556,7 +1570,7 @@ spotify_playback_stop(void)
return ret; return ret;
} }
/* Thread: libspotify */ /* Thread: player and libspotify */
void void
spotify_playback_stop_nonblock(void) spotify_playback_stop_nonblock(void)
{ {