Skip to content

Commit 3bfc403

Browse files
authored
Modify v18_init calls for libspandsp compatibility (#13)
Updated v18_init calls to include additional parameters for compatibility with newer libspandsp versions.
1 parent d871c84 commit 3bfc403

1 file changed

Lines changed: 15 additions & 3 deletions

File tree

src/mod/applications/mod_spandsp/mod_spandsp_dsp.c

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,18 @@
3737

3838
#define TDD_LEAD 10
3939

40+
/*
41+
* Compatibility with libspandsp > 0.0.5
42+
* The old constant names were renamed
43+
*/
44+
#ifndef V18_MODE_5BIT_4545
45+
#define V18_MODE_5BIT_4545 V18_MODE_WEITBRECHT_5BIT_4545
46+
#endif
47+
#ifndef V18_MODE_5BIT_50
48+
#define V18_MODE_5BIT_50 V18_MODE_WEITBRECHT_5BIT_50
49+
#endif
50+
51+
4052
typedef struct {
4153
switch_core_session_t *session;
4254
v18_state_t *tdd_state;
@@ -213,7 +225,7 @@ switch_status_t spandsp_tdd_send_session(switch_core_session_t *session, const c
213225
return SWITCH_STATUS_FALSE;
214226
}
215227

216-
tdd_state = v18_init(NULL, TRUE, get_v18_mode(session), V18_AUTOMODING_GLOBAL, put_text_msg, NULL);
228+
tdd_state = v18_init(NULL, TRUE, get_v18_mode(session), V18_AUTOMODING_GLOBAL, put_text_msg, NULL, NULL, NULL);
217229

218230

219231
v18_put(tdd_state, text, -1);
@@ -260,7 +272,7 @@ switch_status_t spandsp_tdd_encode_session(switch_core_session_t *session, const
260272
}
261273

262274
pvt->session = session;
263-
pvt->tdd_state = v18_init(NULL, TRUE, get_v18_mode(session), V18_AUTOMODING_GLOBAL, put_text_msg, NULL);
275+
pvt->tdd_state = v18_init(NULL, TRUE, get_v18_mode(session), V18_AUTOMODING_GLOBAL, put_text_msg, NULL, NULL, NULL);
264276
pvt->head_lead = TDD_LEAD;
265277

266278
v18_put(pvt->tdd_state, text, -1);
@@ -338,7 +350,7 @@ switch_status_t spandsp_tdd_decode_session(switch_core_session_t *session)
338350
}
339351

340352
pvt->session = session;
341-
pvt->tdd_state = v18_init(NULL, FALSE, get_v18_mode(session), V18_AUTOMODING_GLOBAL, put_text_msg, pvt);
353+
pvt->tdd_state = v18_init(NULL, FALSE, get_v18_mode(session), V18_AUTOMODING_GLOBAL, put_text_msg, pvt, NULL, NULL);
342354

343355
if ((status = switch_core_media_bug_add(session, "spandsp_tdd_decode", NULL,
344356
tdd_decode_callback, pvt, 0, SMBF_READ_REPLACE | SMBF_NO_PAUSE, &bug)) != SWITCH_STATUS_SUCCESS) {

0 commit comments

Comments
 (0)