summaryrefslogtreecommitdiff
path: root/menuselect
diff options
context:
space:
mode:
authorfrahaase <fra.haase@googlemail.com>2016-08-12 18:23:18 +0200
committerGeorge Joseph <gjoseph@digium.com>2017-02-23 10:34:58 -0700
commit094c26aa689664177e156d17bf5e9ab67c442a53 (patch)
tree29a03da022373e1b90804dbc30c9a927848a9217 /menuselect
parent9ad1df71b363d1b3c92622873bb193dca5ddbb8c (diff)
Binaural synthesis (confbridge): Adds binaural synthesis to bridge_softmix.
Adds binaural synthesis to bridge_softmix (via convolution using libfftw3). Binaural synthesis is conducted at 48kHz. For a conference, only one spatial representation is rendered. The default rendering is applied for mono-capable channels. ASTERISK-26292 Change-Id: Iecdb381b6adc17c961049658678f6219adae1ddf
Diffstat (limited to 'menuselect')
-rw-r--r--menuselect/menuselect.c8
-rw-r--r--menuselect/menuselect.h3
2 files changed, 9 insertions, 2 deletions
diff --git a/menuselect/menuselect.c b/menuselect/menuselect.c
index da972d8b1..689cebf62 100644
--- a/menuselect/menuselect.c
+++ b/menuselect/menuselect.c
@@ -238,6 +238,10 @@ static enum support_level_values string_to_support_level(const char *support_lev
return SUPPORT_EXTERNAL;
}
+ if (!strcasecmp(support_level, "option")) {
+ return SUPPORT_OPTION;
+ }
+
return SUPPORT_UNSPECIFIED;
}
@@ -253,6 +257,8 @@ static const char *support_level_to_string(enum support_level_values support_lev
return "Deprecated";
case SUPPORT_EXTERNAL:
return "External";
+ case SUPPORT_OPTION:
+ return "Module Options";
default:
return "Unspecified";
}
@@ -461,7 +467,7 @@ static int process_xml_member_node(xmlNode *node, struct category *cat)
process_process_xml_category_child_node(cur, mem);
}
- if (!cat->positive_output) {
+ if (!cat->positive_output && strcasecmp(mem->support_level, "option")) {
mem->enabled = 1;
if (!mem->defaultenabled || strcasecmp(mem->defaultenabled, "no")) {
mem->was_enabled = 1;
diff --git a/menuselect/menuselect.h b/menuselect/menuselect.h
index bf2bf4c4f..78ae8eff6 100644
--- a/menuselect/menuselect.h
+++ b/menuselect/menuselect.h
@@ -108,7 +108,8 @@ enum support_level_values {
SUPPORT_DEPRECATED = 2,
SUPPORT_UNSPECIFIED = 3,
SUPPORT_EXTERNAL = 4,
- SUPPORT_COUNT = 5, /* Keep this item at the end of the list. Tracks total number of support levels. */
+ SUPPORT_OPTION = 5,
+ SUPPORT_COUNT = 6, /* Keep this item at the end of the list. Tracks total number of support levels. */
};
AST_LIST_HEAD_NOLOCK(support_level_bucket, member);