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

[streaming] Clean up streaming_player_status_update()

Browse Source 
Fixes compiler warning from newer versions of gcc + reduces malloc's
This commit is contained in:
ejurgensen 2021-08-27 16:46:08 +02:00
parent 8204db9e77
commit e1375f6ad6
1 changed files with 18 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/httpd_streaming.c
View File

@ -97,7 +97,7 @@ static int streaming_meta[2];
#define STREAMING_ICY_METAINT_DEFAULT 16384 #define STREAMING_ICY_METAINT_DEFAULT 16384
static unsigned short streaming_icy_metaint = STREAMING_ICY_METAINT_DEFAULT; static unsigned short streaming_icy_metaint = STREAMING_ICY_METAINT_DEFAULT;
static unsigned streaming_icy_clients; static unsigned streaming_icy_clients;
static char *streaming_icy_title; static char streaming_icy_title[STREAMING_ICY_METATITLELEN_MAX];
static void static void
@ -283,8 +283,8 @@ encode_buffer(uint8_t *buffer, size_t size)
static uint8_t * static uint8_t *
streaming_icy_meta_create(uint8_t buf[STREAMING_ICY_METALEN_MAX+1], const char *title, unsigned *buflen) streaming_icy_meta_create(uint8_t buf[STREAMING_ICY_METALEN_MAX+1], const char *title, unsigned *buflen)
{ {
unsigned titlelen = 0; unsigned titlelen;
unsigned metalen = 0; unsigned metalen;
uint8_t no16s; uint8_t no16s;
*buflen = 0; *buflen = 0;
@ -346,38 +346,27 @@ streaming_icy_meta_splice(const uint8_t *data, size_t datalen, off_t offset, siz
} }
static void static void
streaming_player_status_update() streaming_player_status_update(void)
{ {
unsigned x, y; struct db_queue_item *queue_item;
struct db_queue_item *queue_item = NULL; uint32_t prev_id;
struct player_status tmp;
tmp.id = streaming_player_status.id; prev_id = streaming_player_status.id;
player_get_status(&streaming_player_status); player_get_status(&streaming_player_status);
if (tmp.id != streaming_player_status.id && streaming_icy_clients) if (prev_id == streaming_player_status.id || !streaming_icy_clients)
{ {
free(streaming_icy_title); return;
if ( (queue_item = db_queue_fetch_byfileid(streaming_player_status.id)) == NULL)
{
streaming_icy_title = NULL;
}
else
{
x = strlen(queue_item->title);
y = strlen(queue_item->artist);
if (x && y)
{
streaming_icy_title = malloc(x+y+4);
snprintf(streaming_icy_title, x+y+4, "%s - %s", queue_item->title, queue_item->artist);
}
else
{
streaming_icy_title = strdup( x ? queue_item->title : queue_item->artist);
}
free_queue_item(queue_item, 0);
}
} }
queue_item = db_queue_fetch_byfileid(streaming_player_status.id);
if (!queue_item)
{
streaming_icy_title[0] = '\0';
return;
}
snprintf(streaming_icy_title, sizeof(streaming_icy_title), "%s - %s", queue_item->title, queue_item->artist);
} }
static void static void
@ -715,7 +704,6 @@ streaming_init(void)
CHECK_NULL(L_STREAMING, metaev = event_new(evbase_httpd, streaming_meta[0], EV_READ | EV_PERSIST, streaming_meta_cb, NULL)); CHECK_NULL(L_STREAMING, metaev = event_new(evbase_httpd, streaming_meta[0], EV_READ | EV_PERSIST, streaming_meta_cb, NULL));
streaming_icy_clients = 0; streaming_icy_clients = 0;
streaming_icy_title = NULL;
return 0; return 0;
@ -746,7 +734,6 @@ streaming_deinit(void)
transcode_encode_cleanup(&streaming_encode_ctx); transcode_encode_cleanup(&streaming_encode_ctx);
evbuffer_free(streaming_encoded_data); evbuffer_free(streaming_encoded_data);
free(streaming_icy_title);
pthread_mutex_destroy(&streaming_sessions_lck); pthread_mutex_destroy(&streaming_sessions_lck);
} }