mirror/Sunshine
1
0
Fork 0
mirror of https://github.com/LizardByte/Sunshine.git synced 2025-01-04 02:39:56 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Don't shutdown stream if audio capture fails

Browse Source
This commit is contained in:
loki 2021-08-08 13:41:09 +02:00
parent 315ec47523
commit 13d0106feb
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
sunshine/audio.cpp
View File

@ -130,7 +130,7 @@ void capture(safe::mail_t mail, config_t config, void *channel_data) {
auto &control = ref->control; auto &control = ref->control;
if(!control) { if(!control) {
BOOST_LOG(error) << "Couldn't create audio control"sv; shutdown_event->view();
return; return;
} }
@ -223,21 +223,29 @@ int map_stream(int channels, bool quality) {
} }
int start_audio_control(audio_ctx_t &ctx) { int start_audio_control(audio_ctx_t &ctx) {
auto fg = util::fail_guard([]() {
BOOST_LOG(warning) << "There will be no audio"sv;
});
ctx.sink_flag = std::make_unique<std::atomic_bool>(false); ctx.sink_flag = std::make_unique<std::atomic_bool>(false);
if(!(ctx.control = platf::audio_control())) {
return -1;
}
auto sink = ctx.control->sink_info();
if(!sink) {
return -1;
}
// The default sink has not been replaced yet. // The default sink has not been replaced yet.
ctx.restore_sink = false; ctx.restore_sink = false;
if(!(ctx.control = platf::audio_control())) {
return 0;
}
auto sink = ctx.control->sink_info();
if(!sink) {
// Let the calling code know it failed
ctx.control.reset();
return 0;
}
ctx.sink = std::move(*sink); ctx.sink = std::move(*sink);
fg.disable();
return 0; return 0;
} }