diff options
| author | Andreas Eversberg <jolly@eversberg.eu> | 2016-06-20 19:37:56 +0200 |
|---|---|---|
| committer | Andreas Eversberg <jolly@eversberg.eu> | 2016-06-20 19:37:56 +0200 |
| commit | 2ee51022f41d2877a18615cb67e49f9d9f626aaa (patch) | |
| tree | 3a0c4e312a805c0695310959e91899c3e4571072 /src/cnetz | |
| parent | 86daa5a64a24312a0bd622d0c5415ef2b60c27bb (diff) | |
Rename 'compander' to 'compandor'
Diffstat (limited to 'src/cnetz')
| -rw-r--r-- | src/cnetz/cnetz.h | 4 | ||||
| -rw-r--r-- | src/cnetz/dsp.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/cnetz/cnetz.h b/src/cnetz/cnetz.h index 59b18ea..bbdd937 100644 --- a/src/cnetz/cnetz.h +++ b/src/cnetz/cnetz.h @@ -1,4 +1,4 @@ -#include "../common/compander.h" +#include "../common/compandor.h" #include "../common/sender.h" #include "fsk_fm_demod.h" #include "scrambler.h" @@ -58,7 +58,7 @@ typedef struct cnetz { enum cnetz_chan_type chan_type; /* channel type */ scrambler_t scrambler_tx; /* mirror what we transmit to MS */ scrambler_t scrambler_rx; /* mirror what we receive from MS */ - compander_t cstate; + compandor_t cstate; int pre_emphasis; /* use pre_emphasis by this instance */ int de_emphasis; /* use de_emphasis by this instance */ emphasis_t estate; diff --git a/src/cnetz/dsp.c b/src/cnetz/dsp.c index cca40dc..8c8d836 100644 --- a/src/cnetz/dsp.c +++ b/src/cnetz/dsp.c @@ -39,7 +39,7 @@ #define PI M_PI #define FSK_DEVIATION 10000 -#define COMPANDER_0DB 20000 +#define COMPANDOR_0DB 20000 #define BITRATE 5280.0 /* bits per second */ #define BLOCK_BITS 198 /* duration of one time slot including pause at beginning and end */ #define CUT_OFF_OFFSET 300.0 /* cut off frequency for offset filter (level correction between subsequent audio chunks) */ @@ -138,9 +138,9 @@ int dsp_init_sender(cnetz_t *cnetz, int measure_speed, double clock_speed[2], do if (rc < 0) goto error; - /* init compander, according to C-Netz specs, attack and recovery time + /* init compandor, according to C-Netz specs, attack and recovery time * shall not exceed according to ITU G.162 */ - init_compander(&cnetz->cstate, 8000, 5.0, 22.5, COMPANDER_0DB); + init_compandor(&cnetz->cstate, 8000, 5.0, 22.5, COMPANDOR_0DB); /* use this filter to compensate level changes between two subsequent audio chunks */ RC = 1.0 / (CUT_OFF_OFFSET * 2.0 *3.14); |