jyapayne/Sunshine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'nightly' into no-sink-path-rebased

Browse source
This commit is contained in:
Michael Rogers 2022-09-16 11:54:02 -05:00 • committed by GitHub
commit cf6107971d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
57 changed files with 473 additions and 407 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/audio.cpp
View file

@ -75,7 +75,7 @@ auto control_shared = safe::make_shared<audio_ctx_t>(start_audio_control, stop_a
void encodeThread(sample_queue_t samples, config_t config, void *channel_data) {
auto packets = mail::man->queue<packet_t>(mail::audio_packets);
//FIXME: Pick correct opus_stream_config_t based on config.channels
// FIXME: Pick correct opus_stream_config_t based on config.channels
auto stream = &stream_configs[map_stream(config.channels, config.flags[config_t::HIGH_QUALITY])];
opus_t opus { opus_multistream_encoder_create(
@ -120,7 +120,7 @@ void encodeThread(sample_queue_t samples, config_t config, void *channel_data) {
void capture(safe::mail_t mail, config_t config, void *channel_data) {
auto shutdown_event = mail->event<bool>(mail::shutdown);
//FIXME: Pick correct opus_stream_config_t based on config.channels
// FIXME: Pick correct opus_stream_config_t based on config.channels
auto stream = &stream_configs[map_stream(config.channels, config.flags[config_t::HIGH_QUALITY])];
auto ref = control_shared.ref();
@ -135,7 +135,7 @@ void capture(safe::mail_t mail, config_t config, void *channel_data) {
return;
}
// Order of priorty:
// Order of priority:
// 1. Config
// 2. Virtual if available
// 3. Host