use float instead of double for teletone.

git-svn-id: http://svn.openzap.org/svn/openzap/trunk@227 a93c3328-9c30-0410-af19-c9cd2b2d52af
This commit is contained in:
Michael Jerris
2007-06-07 00:33:31 +00:00
parent 4524bd4603
commit 437e7e9eb3
7 changed files with 40 additions and 29 deletions

View File

@@ -211,7 +211,7 @@ int teletone_mux_tones(teletone_generation_session_t *ts, teletone_tone_map_t *m
int wait = 0;
int32_t sample;
int32_t dc = 0;
float vol = ts->volume;
teletone_process_t vol = ts->volume;
ts->samples = 0;
memset(tones, 0, sizeof(tones[0]) * TELETONE_MAX_TONES);
duration = (ts->tmp_duration > -1) ? ts->tmp_duration : ts->duration;
@@ -234,7 +234,7 @@ int teletone_mux_tones(teletone_generation_session_t *ts, teletone_tone_map_t *m
for (ts->samples = 0; ts->samples < ts->datalen && ts->samples < duration; ts->samples++) {
if (ts->decay_direction && ++dc >= ts->decay_step) {
float nvol = vol + ts->decay_direction * ts->decay_factor;
teletone_process_t nvol = vol + ts->decay_direction * ts->decay_factor;
int j;
if (nvol <= TELETONE_VOL_DB_MAX && nvol >= TELETONE_VOL_DB_MIN) {
@@ -355,7 +355,7 @@ int teletone_run(teletone_generation_session_t *ts, char *cmd)
break;
case 'v':
{
float vol = atof(cur + 2);
teletone_process_t vol = (teletone_process_t)atof(cur + 2);
if (vol <= TELETONE_VOL_DB_MAX && vol >= TELETONE_VOL_DB_MIN) {
ts->volume = vol;
}
@@ -370,7 +370,7 @@ int teletone_run(teletone_generation_session_t *ts, char *cmd)
ts->decay_direction = 1;
break;
case '+':
ts->decay_factor = atof(cur + 2);
ts->decay_factor = (teletone_process_t)atof(cur + 2);
break;
case 'w':
ts->wait = atoi(cur + 2) * (ts->rate / 1000);
@@ -419,7 +419,7 @@ int teletone_run(teletone_generation_session_t *ts, char *cmd)
ts->tmp_wait = atoi(p) * (ts->rate / 1000);
i++;
} else {
mymap.freqs[i++ - 2] = atof(p);
mymap.freqs[i++ - 2] = (teletone_process_t)atof(p);
}
p = next;