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

Removed msg_change_fec_data, use msg_universal

Browse Source 
Removed msg_change_fec_data, use msg_universal instead.

This is a more versatile solution allowing further extensions without
a need to modify the global structure at an expese of worse type control.
As a replacement, a tag starting msg_universal::text is used/suggested.
This commit is contained in:
Martin Pulec
2021-10-05 08:56:03 +02:00
parent 99c3a1c221
commit e90cdeb647
3 changed files with 32 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/control_socket.cpp
View File

@@ -499,16 +499,17 @@ static int process_msg(struct control_state *s, fd_t client_fd, char *message, s
send_message(s->root_module, path_audio, (struct message *) msg_audio);
free_response(resp_audio);
} else if(prefix_matches(message, "fec ")) {
struct msg_change_fec_data *msg = (struct msg_change_fec_data *)
new_message(sizeof(struct msg_change_fec_data));
auto *msg = reinterpret_cast<struct msg_universal *>(new_message(sizeof(struct msg_universal)));
char *fec = suffix(message, "fec ");
enum tx_media_type media_type{};
strncpy(msg->text, MSG_UNIVERSAL_TAG_TX "fec ", sizeof(msg->text) - 1);
if(strncasecmp(fec, "audio ", 6) == 0) {
msg->media_type = TX_MEDIA_AUDIO;
strncpy(msg->fec, fec + 6, sizeof(msg->fec) - 1);
media_type = TX_MEDIA_AUDIO;
strncat(msg->text, fec + 6, sizeof(msg->text) - strlen(msg->text) - 1);
} else if(strncasecmp(fec, "video ", 6) == 0) {
msg->media_type = TX_MEDIA_VIDEO;
strncpy(msg->fec, fec + 6, sizeof(msg->fec) - 1);
media_type = TX_MEDIA_VIDEO;
strncat(msg->text, fec + 6, sizeof(msg->text) - strlen(msg->text) - 1);
} else {
resp = new_response(RESPONSE_NOT_FOUND, "unknown media type");
free(msg);
@@ -516,7 +517,7 @@ static int process_msg(struct control_state *s, fd_t client_fd, char *message, s
}
if (msg) {
if(msg->media_type == TX_MEDIA_VIDEO) {
if (media_type == TX_MEDIA_VIDEO) {
enum module_class path_tx[] = { MODULE_CLASS_SENDER, MODULE_CLASS_TX, MODULE_CLASS_NONE };
append_message_path(path, sizeof(path),
path_tx);