diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-10-15 22:33:46 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-10-16 10:13:26 +0200 |
| commit | c8fa584045ad65283a85015f18ee8789ddf881d1 (patch) | |
| tree | 9887fe131c628a27555afcf705c565ba91ad9c16 /src/wx | |
| parent | 0e896f9f37db001f34c876ed5fc50e874f96ae09 (diff) | |
Always block waiting for audio when exporting.v2.15.169
Otherwise if there is non available we'll insert silence and potentially
push the audio out of sync (late). May help with #2098.
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/film_viewer.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index 22de7b593..e678c6aa3 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -649,7 +649,7 @@ int FilmViewer::audio_callback (void* out_p, unsigned int frames) { while (true) { - auto t = _butler->get_audio (reinterpret_cast<float*> (out_p), frames); + auto t = _butler->get_audio (Butler::Behaviour::NON_BLOCKING, reinterpret_cast<float*> (out_p), frames); if (!t || DCPTime(uncorrected_time() - *t) < one_video_frame()) { /* There was an underrun or this audio is on time; carry on */ break; |