mirror of
https://github.com/signalwire/freeswitch.git
synced 2025-02-08 17:02:23 +00:00
make endpoint auto-answer configurable via {endpoint_answer=yes|no} in the dial string
do not warn about ring device since is acceptable to not have one
This commit is contained in:
parent
de05a65108
commit
b2d696b3fd
@ -1132,6 +1132,7 @@ static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *sessi
|
|||||||
int sample_rate = 0;
|
int sample_rate = 0;
|
||||||
audio_endpoint_t *endpoint = NULL;
|
audio_endpoint_t *endpoint = NULL;
|
||||||
char *endpoint_name = NULL;
|
char *endpoint_name = NULL;
|
||||||
|
const char *endpoint_answer = NULL;
|
||||||
|
|
||||||
if (!outbound_profile) {
|
if (!outbound_profile) {
|
||||||
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing caller profile\n");
|
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing caller profile\n");
|
||||||
@ -1227,7 +1228,13 @@ static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *sessi
|
|||||||
goto error;
|
goto error;
|
||||||
}
|
}
|
||||||
switch_snprintf(name, sizeof(name), "portaudio/endpoint-%s", endpoint_name);
|
switch_snprintf(name, sizeof(name), "portaudio/endpoint-%s", endpoint_name);
|
||||||
switch_set_flag(tech_pvt, TFLAG_AUTO_ANSWER);
|
if (var_event && (endpoint_answer = (switch_event_get_header(var_event, "endpoint_answer")))) {
|
||||||
|
if (switch_true(endpoint_answer)) {
|
||||||
|
switch_set_flag(tech_pvt, TFLAG_AUTO_ANSWER);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
switch_set_flag(tech_pvt, TFLAG_AUTO_ANSWER);
|
||||||
|
}
|
||||||
endpoint->master = tech_pvt;
|
endpoint->master = tech_pvt;
|
||||||
tech_pvt->audio_endpoint = endpoint;
|
tech_pvt->audio_endpoint = endpoint;
|
||||||
switch_mutex_unlock(endpoint->mutex);
|
switch_mutex_unlock(endpoint->mutex);
|
||||||
@ -1751,7 +1758,7 @@ static switch_status_t load_config(void)
|
|||||||
|
|
||||||
if (globals.ringdev < 0) {
|
if (globals.ringdev < 0) {
|
||||||
if (globals.outdev > -1) {
|
if (globals.outdev > -1) {
|
||||||
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid ring device configured using output device\n");
|
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "No ring device configured, using output device\n");
|
||||||
globals.ringdev = globals.outdev;
|
globals.ringdev = globals.outdev;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user