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

Initialize audio network only if used

Browse Source
This commit is contained in:
Martin Pulec
2021-05-25 14:38:04 +02:00
parent 613c62bf54
commit 1d47a5f00d
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/audio/audio.cpp
View File

@@ -100,6 +100,7 @@ enum audio_transport_device {
};
#define DEFAULT_AUDIO_RECV_BUF_SIZE (256 * 1024)
constexpr const char *MOD_NAME = "[audio] ";
struct audio_network_parameters {
char *addr = nullptr;
@@ -316,14 +317,6 @@ struct state_audio * audio_cfg_init(struct module *parent, const char *addrs, in
s->audio_network_parameters.mcast_if = mcast_if
? strdup(mcast_if) : NULL;
s->audio_network_parameters.ttl = ttl;
if ((s->audio_network_device = initialize_audio_network(
&s->audio_network_parameters))
== NULL) {
printf("Unable to open audio network\n");
free(tmp);
goto error;
}
free(tmp);
if (strcmp(send_cfg, "none") != 0) {
@@ -383,6 +376,15 @@ struct state_audio * audio_cfg_init(struct module *parent, const char *addrs, in
s->audio_playback_device = audio_playback_init_null_device();
}
if (s->audio_tx_mode != 0) {
if ((s->audio_network_device = initialize_audio_network(
&s->audio_network_parameters))
== nullptr) {
LOG(LOG_LEVEL_ERROR) << MOD_NAME << "Unable to open audio network\n";
goto error;
}
}
s->proto_cfg = proto_cfg;
if (strcasecmp(proto, "ultragrid_rtp") == 0) {