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

[outputs] Rename output_buffer.frame to .data

Browse Source
This commit is contained in:
ejurgensen
2019-02-22 08:40:59 +01:00
parent 5c35e1a9db
commit b811122566
5 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/outputs/fifo.c
View File

@@ -413,13 +413,13 @@ fifo_write(struct output_buffer *obuf)
if (!fifo_session)
return;
for (i = 0; obuf->frames[i].buffer; i++)
for (i = 0; obuf->data[i].buffer; i++)
{
if (quality_is_equal(&fifo_quality, &obuf->frames[i].quality))
if (quality_is_equal(&fifo_quality, &obuf->data[i].quality))
break;
}
if (!obuf->frames[i].buffer)
if (!obuf->data[i].buffer)
{
DPRINTF(E_LOG, L_FIFO, "Bug! Did not get audio in quality required\n");
return;
@@ -428,10 +428,10 @@ fifo_write(struct output_buffer *obuf)
fifo_session->state = OUTPUT_STATE_STREAMING;
CHECK_NULL(L_FIFO, packet = calloc(1, sizeof(struct fifo_packet)));
CHECK_NULL(L_FIFO, packet->samples = malloc(obuf->frames[i].bufsize));
CHECK_NULL(L_FIFO, packet->samples = malloc(obuf->data[i].bufsize));
memcpy(packet->samples, obuf->frames[i].buffer, obuf->frames[i].bufsize);
packet->samples_size = obuf->frames[i].bufsize;
memcpy(packet->samples, obuf->data[i].buffer, obuf->data[i].bufsize);
packet->samples_size = obuf->data[i].bufsize;
packet->pts = obuf->pts;
if (buffer.head)

8
src/outputs/raop.c
View File

@@ -4868,16 +4868,16 @@ raop_write(struct output_buffer *obuf)
for (rms = raop_master_sessions; rms; rms = rms->next)
{
for (i = 0; obuf->frames[i].buffer; i++)
for (i = 0; obuf->data[i].buffer; i++)
{
if (!quality_is_equal(&obuf->frames[i].quality, &rms->rtp_session->quality))
if (!quality_is_equal(&obuf->data[i].quality, &rms->rtp_session->quality))
continue;
// Sends sync packets to new sessions, and if it is sync time then also to old sessions
packets_sync_send(rms, obuf->pts);
evbuffer_add_buffer_reference(rms->evbuf, obuf->frames[i].evbuf);
rms->evbuf_samples += obuf->frames[i].samples;
evbuffer_add_buffer_reference(rms->evbuf, obuf->data[i].evbuf);
rms->evbuf_samples += obuf->data[i].samples;
// Send as many packets as we have data for (one packet requires rawbuf_size bytes)
while (evbuffer_get_length(rms->evbuf) >= rms->rawbuf_size)