Skip to content

F
freeswitch
提交 4c464fd5 authored 作者: Steve Underwood's avatar Steve Underwood
浏览文件
操作

Some missed renamings from the last change to spandsp's tone_generate

上级 11473121
隐藏空白字符变更
内嵌 并排
正在显示 包含 18 行增加 和 18 行删除
libs/spandsp/spandsp-sim/line_model.c
浏览文件 @ 4c464fd5
......@@ -347,7 +347,7 @@ SPAN_DECLARE(void) one_way_line_model_set_mains_pickup(one_way_line_model_state_
if (f)
{
make_tone_gen_descriptor(&mains_tone_desc, f, (int) (level - 10.0f), f*3, (int) level, 1, 0, 0, 0, TRUE);
tone_gen_descriptor_init(&mains_tone_desc, f, (int) (level - 10.0f), f*3, (int) level, 1, 0, 0, 0, TRUE);
tone_gen_init(&s->mains_tone, &mains_tone_desc);
}
s->mains_interference = f;
......@@ -456,9 +456,9 @@ SPAN_DECLARE(void) both_ways_line_model_set_mains_pickup(both_ways_line_model_st
if (f)
{
make_tone_gen_descriptor(&mains_tone_desc, f, (int) (level1 - 10.0f), f*3, (int) level1, 1, 0, 0, 0, TRUE);
tone_gen_descriptor_init(&mains_tone_desc, f, (int) (level1 - 10.0f), f*3, (int) level1, 1, 0, 0, 0, TRUE);
tone_gen_init(&s->line1.mains_tone, &mains_tone_desc);
make_tone_gen_descriptor(&mains_tone_desc, f, (int) (level2 - 10.0f), f*3, (int) level2, 1, 0, 0, 0, TRUE);
tone_gen_descriptor_init(&mains_tone_desc, f, (int) (level2 - 10.0f), f*3, (int) level2, 1, 0, 0, 0, TRUE);
tone_gen_init(&s->line2.mains_tone, &mains_tone_desc);
}
s->line1.mains_interference = f;
......
libs/spandsp/src/adsi.c
浏览文件 @ 4c464fd5
......@@ -650,7 +650,7 @@ SPAN_DECLARE(adsi_tx_state_t *) adsi_tx_init(adsi_tx_state_t *s, int standard)
return NULL;
}
memset(s, 0, sizeof(*s));
make_tone_gen_descriptor(&(s->alert_tone_desc),
tone_gen_descriptor_init(&(s->alert_tone_desc),
2130,
-13,
2750,
......
libs/spandsp/src/bell_r2_mf.c
浏览文件 @ 4c464fd5
......@@ -262,7 +262,7 @@ static void bell_mf_gen_init(void)
while (tones->on_time)
{
/* Note: The duration of KP is longer than the other signals. */
make_tone_gen_descriptor(&bell_mf_digit_tones[i++],
tone_gen_descriptor_init(&bell_mf_digit_tones[i++],
tones->f1,
tones->level1,
tones->f2,
......@@ -409,7 +409,7 @@ SPAN_DECLARE(r2_mf_tx_state_t *) r2_mf_tx_init(r2_mf_tx_state_t *s, int fwd)
tones = r2_mf_fwd_tones;
while (tones->on_time)
{
make_tone_gen_descriptor(&r2_mf_fwd_digit_tones[i++],
tone_gen_descriptor_init(&r2_mf_fwd_digit_tones[i++],
tones->f1,
tones->level1,
tones->f2,
......@@ -425,7 +425,7 @@ SPAN_DECLARE(r2_mf_tx_state_t *) r2_mf_tx_init(r2_mf_tx_state_t *s, int fwd)
tones = r2_mf_back_tones;
while (tones->on_time)
{
make_tone_gen_descriptor(&r2_mf_back_digit_tones[i++],
tone_gen_descriptor_init(&r2_mf_back_digit_tones[i++],
tones->f1,
tones->level1,
tones->f2,
......
libs/spandsp/src/dtmf.c
浏览文件 @ 4c464fd5
......@@ -434,7 +434,7 @@ static void dtmf_tx_initialise(void)
{
for (col = 0; col < 4; col++)
{
make_tone_gen_descriptor(&dtmf_digit_tones[row*4 + col],
tone_gen_descriptor_init(&dtmf_digit_tones[row*4 + col],
(int) dtmf_row[row],
DEFAULT_DTMF_TX_LEVEL,
(int) dtmf_col[col],
......
libs/spandsp/tests/bell_mf_rx_tests.c
浏览文件 @ 4c464fd5
......@@ -134,7 +134,7 @@ static void my_mf_gen_init(float low_fudge,
be 100/68 */
for (i = 0; i < 15; i++)
{
make_tone_gen_descriptor(&my_mf_digit_tones[i],
tone_gen_descriptor_init(&my_mf_digit_tones[i],
bell_mf_tones[i].f1*(1.0 + low_fudge),
low_level,
bell_mf_tones[i].f2*(1.0 + high_fudge),
......
libs/spandsp/tests/dtmf_rx_tests.c
浏览文件 @ 4c464fd5
......@@ -179,7 +179,7 @@ static void my_dtmf_gen_init(float low_fudge,
{
for (col = 0; col < 4; col++)
{
make_tone_gen_descriptor(&my_dtmf_digit_tones[row*4 + col],
tone_gen_descriptor_init(&my_dtmf_digit_tones[row*4 + col],
dtmf_row[row]*(1.0f + low_fudge),
low_level,
dtmf_col[col]*(1.0f + high_fudge),
......@@ -704,7 +704,7 @@ static void dial_tone_tolerance_tests(void)
for (j = -30; j < -3; j++)
{
make_tone_gen_descriptor(&dial_tone_desc, 350, j, 440, j, 1, 0, 0, 0, TRUE);
tone_gen_descriptor_init(&dial_tone_desc, 350, j, 440, j, 1, 0, 0, 0, TRUE);
tone_gen_init(&dial_tone, &dial_tone_desc);
for (i = 0; i < 10; i++)
{
......
libs/spandsp/tests/echo_tests.c
浏览文件 @ 4c464fd5
......@@ -1139,7 +1139,7 @@ static int perform_test_6(void)
that nothing unpleasant happens. */
for (k = 0; tones_6_4_2_7[k][0]; k++)
{
make_tone_gen_descriptor(&tone_desc,
tone_gen_descriptor_init(&tone_desc,
tones_6_4_2_7[k][0],
-11,
tones_6_4_2_7[k][1],
......@@ -1201,7 +1201,7 @@ static int perform_test_7(void)
happens. */
echo_can_flush(ctx);
echo_can_adaption_mode(ctx, ECHO_CAN_USE_ADAPTION);
make_tone_gen_descriptor(&tone_desc,
tone_gen_descriptor_init(&tone_desc,
tones_6_4_2_7[0][0],
-11,
tones_6_4_2_7[0][1],
......
libs/spandsp/tests/fsk_tests.c
浏览文件 @ 4c464fd5
......@@ -312,7 +312,7 @@ int main(int argc, char *argv[])
on_at = 0;
for (i = -40; i < -25; i++)
{
make_tone_gen_descriptor(&tone_desc,
tone_gen_descriptor_init(&tone_desc,
1500,
i,
0,
......@@ -335,7 +335,7 @@ int main(int argc, char *argv[])
off_at = 0;
for ( ; i > -40; i--)
{
make_tone_gen_descriptor(&tone_desc,
tone_gen_descriptor_init(&tone_desc,
1500,
i,
0,
......
libs/spandsp/tests/g168_tests.c
浏览文件 @ 4c464fd5
......@@ -155,7 +155,7 @@ int main(int argc, char *argv[])
for (f = 10; f < 4000; f++)
{
make_tone_gen_descriptor(&tone_desc,
tone_gen_descriptor_init(&tone_desc,
f,
-10,
0,
......
libs/spandsp/tests/power_meter_tests.c
浏览文件 @ 4c464fd5
......@@ -256,7 +256,7 @@ static int power_meter_tests(void)
}
printf("Testing with a sine wave tone 10dB from maximum\n");
make_tone_gen_descriptor(&tone_desc,
tone_gen_descriptor_init(&tone_desc,
1000,
-4,
0,
......
libs/spandsp/tests/r2_mf_rx_tests.c
浏览文件 @ 4c464fd5
......@@ -163,7 +163,7 @@ static void my_mf_gen_init(float low_fudge,
tone = &r2_mf_fwd_tones[i];
else
tone = &r2_mf_back_tones[i];
make_tone_gen_descriptor(&my_mf_digit_tones[i],
tone_gen_descriptor_init(&my_mf_digit_tones[i],
tone->f1*(1.0 + low_fudge),
low_level,
tone->f2*(1.0 + high_fudge),
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论