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

diff --git a/libs/spandsp/spandsp-sim/line_model.c b/libs/spandsp/spandsp-sim/line_model.c
index 5e09b39fd12e88aa0dabdab50bfaced242b42c83..88af203ab0d236b8b897224366f181f5df9dfa18 100644 (file)
--- a/libs/spandsp/spandsp-sim/line_model.c
+++ b/libs/spandsp/spandsp-sim/line_model.c
@@ -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;

diff --git a/libs/spandsp/src/adsi.c b/libs/spandsp/src/adsi.c
index 33df514ff933c6417ace98774ee2b3ba4cb2f262..2e4de25ad18d81225afddf68b6bb071cea12bfca 100644 (file)
--- a/libs/spandsp/src/adsi.c
+++ b/libs/spandsp/src/adsi.c
@@ -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,

diff --git a/libs/spandsp/src/bell_r2_mf.c b/libs/spandsp/src/bell_r2_mf.c
index a2b2dc2ebebe654124c4adbb499a4b6d82cb4509..ae124759212919c73bdab45ad5b44fba0a5c27a8 100644 (file)
--- a/libs/spandsp/src/bell_r2_mf.c
+++ b/libs/spandsp/src/bell_r2_mf.c
@@ -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,

diff --git a/libs/spandsp/src/dtmf.c b/libs/spandsp/src/dtmf.c
index 99d89043dd6f717d33ea518d04b4e72745aab762..fca60dd4d1306a89eb2a40448eba9a58fbacacca 100644 (file)
--- a/libs/spandsp/src/dtmf.c
+++ b/libs/spandsp/src/dtmf.c
@@ -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],

diff --git a/libs/spandsp/tests/bell_mf_rx_tests.c b/libs/spandsp/tests/bell_mf_rx_tests.c
index 5ffccc27e2e4d960ca63b754de1628b0859655f8..c1aa73633bb32538244b845d273b43cd3a9c9654 100644 (file)
--- a/libs/spandsp/tests/bell_mf_rx_tests.c
+++ b/libs/spandsp/tests/bell_mf_rx_tests.c
@@ -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),

diff --git a/libs/spandsp/tests/dtmf_rx_tests.c b/libs/spandsp/tests/dtmf_rx_tests.c
index 69d0fda8652cb8b69c7c4c499ae602b6d593c57e..63c74d48a3b2484205d277fbb976651a9be8dda8 100644 (file)
--- a/libs/spandsp/tests/dtmf_rx_tests.c
+++ b/libs/spandsp/tests/dtmf_rx_tests.c
@@ -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++)
         {

diff --git a/libs/spandsp/tests/echo_tests.c b/libs/spandsp/tests/echo_tests.c
index 435ed7705a6aae3bfb1e1a94ad45a776db465a58..0878bbc67d77e83526234c8f837fdd229916d2e9 100644 (file)
--- a/libs/spandsp/tests/echo_tests.c
+++ b/libs/spandsp/tests/echo_tests.c
@@ -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],

diff --git a/libs/spandsp/tests/fsk_tests.c b/libs/spandsp/tests/fsk_tests.c
index 57e226e0cffb5ac9c310592612c6f02156f11d55..a54f0d3bcbf8a4f1ebf4abab5934920ea127d279 100644 (file)
--- a/libs/spandsp/tests/fsk_tests.c
+++ b/libs/spandsp/tests/fsk_tests.c
@@ -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,

diff --git a/libs/spandsp/tests/g168_tests.c b/libs/spandsp/tests/g168_tests.c
index e8a7c934cff3d0b5853b7b4221d89d6a61dece82..0484aac7d6c526103fee20d8e0a3aa289dd31bd5 100644 (file)
--- a/libs/spandsp/tests/g168_tests.c
+++ b/libs/spandsp/tests/g168_tests.c
@@ -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,

diff --git a/libs/spandsp/tests/power_meter_tests.c b/libs/spandsp/tests/power_meter_tests.c
index d5050924d73a6fee0f00a9c3b65c2fef29ee4e44..fc4888150b7c7d7698fe57a3b5d3941d749b5a00 100644 (file)
--- a/libs/spandsp/tests/power_meter_tests.c
+++ b/libs/spandsp/tests/power_meter_tests.c
@@ -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,

diff --git a/libs/spandsp/tests/r2_mf_rx_tests.c b/libs/spandsp/tests/r2_mf_rx_tests.c
index 43b2abb610eecdd2318896f9d5874276d6378585..f36aec25d8e69a7c111998c61d6229e419cb3a5b 100644 (file)
--- a/libs/spandsp/tests/r2_mf_rx_tests.c
+++ b/libs/spandsp/tests/r2_mf_rx_tests.c
@@ -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),