History

Revert "ao_pipewire: add EOF handling"

This reverts commit 3fc8929caf6ba4b89c849a8fcde76841f26d8584.

Misaki Kasumi committed 2 years ago

Commit ef026ff1 parent 2938ed51 file · +1 −7Browse files

Unified · Split

audio/out/ao_pipewire.c+1−7
@@ -206,8 +206,7 @@ static void on_process(void *userdata) · 205 unmodified lines
206#endif206#endif
207 end_time -= pw_stream_get_nsec(p->stream) - time.now;207 end_time -= pw_stream_get_nsec(p->stream) - time.now;
208 208
209 bool eof;209 int samples = ao_read_data(ao, data, nframes, end_time, NULL, false, false);
210 int samples = ao_read_data(ao, data, nframes, end_time, &eof, false, false);
211 b->size = samples;210 b->size = samples;
212 211
213 for (int i = 0; i < buf->n_datas; i++) {212 for (int i = 0; i < buf->n_datas; i++) {
@@ -218,11 +217,6 @@ static void on_process(void *userdata) · 4 unmodified lines
218 217
219 pw_stream_queue_buffer(p->stream, b);218 pw_stream_queue_buffer(p->stream, b);
220 219
221 if (eof) {
222 pw_stream_flush(p->stream, true);
223 ao_stop_streaming(ao);
224 }
225
226 MP_TRACE(ao, "queued %d of %d samples\n", samples, nframes);220 MP_TRACE(ao, "queued %d of %d samples\n", samples, nframes);
227}221}
228 222

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t