doh

diff --git a/libs/freetdm/src/libteletone_generate.c b/libs/freetdm/src/libteletone_generate.c
index 3abbebba2efaa69ed2c88e2524d5cd0e6e9eb578..089268bc7b5d4d29889c41293a32b6f826c6ab7f 100644 (file)
--- a/libs/freetdm/src/libteletone_generate.c
+++ b/libs/freetdm/src/libteletone_generate.c
@@ -244,7 +244,7 @@ TELETONE_API(int) teletone_mux_tones(teletone_generation_session_t *ts, teletone
 
        if (ts->debug && ts->debug_stream) {
                if (map->freqs[0] <= 0) {
-                       fprintf(ts->debug_stream, "wait %d (%dms)\n", wait, wait / (ts->rate / 1000 / ts->channels ? ts->channels : 1));
+                       fprintf(ts->debug_stream, "wait %d (%dms)\n", wait, wait / (ts->rate / 1000));
                } else {
                        fprintf(ts->debug_stream, "Generate: (");
 
@@ -256,14 +256,14 @@ TELETONE_API(int) teletone_mux_tones(teletone_generation_session_t *ts, teletone
                                        ") [volume %0.2fdB; samples %d(%dms) x %d channel%s; wait %d(%dms); decay_factor %0.2fdB; decay_step %d(%dms); wrote %d bytes]\n",
                                        ts->volume,
                                        duration,
-                                       duration / (ts->rate / 1000 / ts->channels ? ts->channels : 1), 
+                                       duration / (ts->rate / 1000), 
                                        ts->channels,
                                        ts->channels == 1 ? "" : "s",
                                        wait,
-                                       wait / (ts->rate / 1000 / ts->channels ? ts->channels : 1),
+                                       wait / (ts->rate / 1000),
                                        ts->decay_factor,
                                        ts->decay_step,
-                                       ts->decay_step / (ts->rate / 1000 / ts->channels ? ts->channels : 1),                                   
+                                       ts->decay_step / (ts->rate / 1000),                                     
                                        ts->samples * 2);
                }
        }       
@@ -307,7 +307,7 @@ TELETONE_API(int) teletone_run(teletone_generation_session_t *ts, const char *cm
                                        ts->rate = atoi(cur + 2);
                                        break;
                                case 'd':
-                                       ts->duration = atoi(cur + 2) * (ts->rate / 1000 / ts->channels ? ts->channels : 1);
+                                       ts->duration = atoi(cur + 2) * (ts->rate / 1000);
                                        break;
                                case 'v':
                                        {
@@ -318,18 +318,18 @@ TELETONE_API(int) teletone_run(teletone_generation_session_t *ts, const char *cm
                                        }
                                        break;
                                case '>':
-                                       ts->decay_step = atoi(cur + 2) * (ts->rate / 1000 / ts->channels ? ts->channels : 1);
+                                       ts->decay_step = atoi(cur + 2) * (ts->rate / 1000);
                                        ts->decay_direction = -1;
                                        break;
                                case '<':
-                                       ts->decay_step = atoi(cur + 2) * (ts->rate / 1000 / ts->channels ? ts->channels : 1);
+                                       ts->decay_step = atoi(cur + 2) * (ts->rate / 1000);
                                        ts->decay_direction = 1;
                                        break;
                                case '+':
                                        ts->decay_factor = (float)atof(cur + 2);
                                        break;
                                case 'w':
-                                       ts->wait = atoi(cur + 2) * (ts->rate / 1000 / ts->channels ? ts->channels : 1);
+                                       ts->wait = atoi(cur + 2) * (ts->rate / 1000);
                                        break;
                                case 'l':
                                        ts->loops = atoi(cur + 2); 
@@ -369,10 +369,10 @@ TELETONE_API(int) teletone_run(teletone_generation_session_t *ts, const char *cm
                                                                        *next++ = '\0';
                                                                }
                                                                if (i == 0) {
-                                                                       ts->tmp_duration = atoi(p) * (ts->rate / 1000 / ts->channels ? ts->channels : 1);
+                                                                       ts->tmp_duration = atoi(p) * (ts->rate / 1000);
                                                                        i++;
                                                                } else if (i == 1) {
-                                                                       ts->tmp_wait = atoi(p) * (ts->rate / 1000 / ts->channels ? ts->channels : 1);
+                                                                       ts->tmp_wait = atoi(p) * (ts->rate / 1000);
                                                                        i++;
                                                                } else {
                                                                        mymap.freqs[i++ - 2] = atof(p);

diff --git a/libs/libteletone/src/libteletone_generate.c b/libs/libteletone/src/libteletone_generate.c
index 1608f47bb771c785828f2016514a2c13696f1d9d..911e3c27971320f6a48257542eaa33ed615b49c2 100644 (file)
--- a/libs/libteletone/src/libteletone_generate.c
+++ b/libs/libteletone/src/libteletone_generate.c
@@ -355,7 +355,7 @@ TELETONE_API(int) teletone_run(teletone_generation_session_t *ts, const char *cm
                                        ts->rate = atoi(cur + 2);
                                        break;
                                case 'd':
-                                       ts->duration = atoi(cur + 2) * (ts->rate / 1000 / ts->channels ? ts->channels : 1);
+                                       ts->duration = atoi(cur + 2) * (ts->rate / 1000);
                                        break;
                                case 'v':
                                        {
@@ -366,18 +366,18 @@ TELETONE_API(int) teletone_run(teletone_generation_session_t *ts, const char *cm
                                        }
                                        break;
                                case '>':
-                                       ts->decay_step = atoi(cur + 2) * (ts->rate / 1000 / ts->channels ? ts->channels : 1);
+                                       ts->decay_step = atoi(cur + 2) * (ts->rate / 1000);
                                        ts->decay_direction = -1;
                                        break;
                                case '<':
-                                       ts->decay_step = atoi(cur + 2) * (ts->rate / 1000 / ts->channels ? ts->channels : 1);
+                                       ts->decay_step = atoi(cur + 2) * (ts->rate / 1000);
                                        ts->decay_direction = 1;
                                        break;
                                case '+':
                                        ts->decay_factor = (float)atof(cur + 2);
                                        break;
                                case 'w':
-                                       ts->wait = atoi(cur + 2) * (ts->rate / 1000 / ts->channels ? ts->channels : 1);
+                                       ts->wait = atoi(cur + 2) * (ts->rate / 1000);
                                        break;
                                case 'l':
                                        ts->loops = atoi(cur + 2); 
@@ -417,10 +417,10 @@ TELETONE_API(int) teletone_run(teletone_generation_session_t *ts, const char *cm
                                                                        *next++ = '\0';
                                                                }
                                                                if (i == 0) {
-                                                                       ts->tmp_duration = atoi(p) * (ts->rate / 1000 / ts->channels ? ts->channels : 1);
+                                                                       ts->tmp_duration = atoi(p) * (ts->rate / 1000);
                                                                        i++;
                                                                } else if (i == 1) {
-                                                                       ts->tmp_wait = atoi(p) * (ts->rate / 1000 / ts->channels ? ts->channels : 1);
+                                                                       ts->tmp_wait = atoi(p) * (ts->rate / 1000);
                                                                        i++;
                                                                } else {
                                                                        mymap.freqs[i++ - 2] = atof(p);