scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-21 17:40:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

main: set audio data always

Browse Source 
The audio state is always present (even if no audio rx/tx is used),
so set this always.

This will allow setting the data also for tx (the vrxtx) - the check if
either audio tx or rx is unnecessary (as indicated above).
This commit is contained in:
Martin Pulec
2024-08-07 16:38:34 +02:00
parent 0d143d3789
commit 78f2a30f12
2 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/audio/audio.cpp
View File

@@ -1182,16 +1182,19 @@ void
audio_register_aux_data(struct state_audio *s,
struct additional_audio_data data)
{
struct state_sdi_playback *sdi_playback;
if(!audio_playback_get_display_flags(s->audio_playback_device))
return;
sdi_playback = (struct state_sdi_playback *) audio_playback_get_state_pointer(s->audio_playback_device);
sdi_register_display_callbacks(
sdi_playback, data.display_callbacks.udata,
(void (*)(void *, const struct audio_frame *)) data.display_callbacks.putf,
(bool (*)(void *, int, int, int)) data.display_callbacks.reconfigure,
(bool (*)(void *, int, void *, size_t *)) data.display_callbacks.get_property);
if (audio_playback_get_display_flags(s->audio_playback_device) != 0U) {
auto *sdi_playback = (struct state_sdi_playback *)
audio_playback_get_state_pointer(s->audio_playback_device);
sdi_register_display_callbacks(
sdi_playback, data.display_callbacks.udata,
(void (*)(void *, const struct audio_frame *))
data.display_callbacks.putf,
(bool (*)(void *, int, int,
int)) data.display_callbacks.reconfigure,
(bool (*)(void *, int, void *,
size_t *)) data.display_callbacks.get_property);
}
s->vrxtx = data.vrxtx;
}

14
src/main.cpp
View File

@@ -1479,14 +1479,12 @@ int main(int argc, char *argv[])
}
}
if(audio_get_display_flags(uv.audio)) {
struct additional_audio_data aux = {
{ uv.display_device, display_put_audio_frame,
display_reconfigure_audio, display_ctl_property },
uv.state_video_rxtx,
};
audio_register_aux_data(uv.audio, aux);
}
struct additional_audio_data aux = {
{ uv.display_device, display_put_audio_frame,
display_reconfigure_audio, display_ctl_property },
uv.state_video_rxtx,
};
audio_register_aux_data(uv.audio, aux);
if (opt.requested_capabilities != nullptr) {
print_capabilities(opt.requested_capabilities);