Cleanup, add support for Diva streaming to NULL PLCI
This commit is contained in:
parent
1eeb822d08
commit
6fda685af2
11
chan_capi.c
11
chan_capi.c
|
@ -1572,7 +1572,7 @@ static int pbx_capi_call(struct ast_channel *c, char *idest, int timeout)
|
||||||
|
|
||||||
#ifdef DIVA_STREAMING
|
#ifdef DIVA_STREAMING
|
||||||
i->diva_stream_entry = 0;
|
i->diva_stream_entry = 0;
|
||||||
if (capi_controllers[i->controller]->divaStreaming != 0) {
|
if (pbx_capi_streaming_supported (i) != 0) {
|
||||||
capi_DivaStreamingOn(i, 1, i->MessageNumber);
|
capi_DivaStreamingOn(i, 1, i->MessageNumber);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
@ -5026,7 +5026,7 @@ static void capidev_handle_connect_indication(_cmsg *CMSG, unsigned int PLCI, un
|
||||||
|
|
||||||
#ifdef DIVA_STREAMING
|
#ifdef DIVA_STREAMING
|
||||||
i->diva_stream_entry = 0;
|
i->diva_stream_entry = 0;
|
||||||
if (capi_controllers[i->controller]->divaStreaming != 0) {
|
if (pbx_capi_streaming_supported (i) != 0) {
|
||||||
capi_DivaStreamingOn(i, 0, 0);
|
capi_DivaStreamingOn(i, 0, 0);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
@ -8724,3 +8724,10 @@ char *key()
|
||||||
return ASTERISK_GPL_KEY;
|
return ASTERISK_GPL_KEY;
|
||||||
}
|
}
|
||||||
#endif /* CC_AST_HAS_VERSION_1_4 */
|
#endif /* CC_AST_HAS_VERSION_1_4 */
|
||||||
|
|
||||||
|
#ifdef DIVA_STREAMING
|
||||||
|
int pbx_capi_streaming_supported (struct capi_pvt *i)
|
||||||
|
{
|
||||||
|
return (i != 0 && i->controller <= CAPI_MAX_CONTROLLERS && capi_controllers[i->controller]->divaStreaming != 0);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
|
@ -729,6 +729,10 @@ struct _diva_streaming_vector;
|
||||||
void capidev_handle_data_b3_indication_vector (struct capi_pvt *i,
|
void capidev_handle_data_b3_indication_vector (struct capi_pvt *i,
|
||||||
struct _diva_streaming_vector* vind,
|
struct _diva_streaming_vector* vind,
|
||||||
int vind_nr);
|
int vind_nr);
|
||||||
|
/*!
|
||||||
|
* \brief Return true if Diva streaming supported by CAPI controller
|
||||||
|
*/
|
||||||
|
int pbx_capi_streaming_supported (struct capi_pvt *i);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* DIVA specific MANUFACTURER definitions */
|
/* DIVA specific MANUFACTURER definitions */
|
||||||
|
|
|
@ -228,6 +228,13 @@ struct capi_pvt *capi_mknullif(struct ast_channel *c, unsigned long long control
|
||||||
tmp->state = CAPI_STATE_CONNECTPENDING;
|
tmp->state = CAPI_STATE_CONNECTPENDING;
|
||||||
tmp->MessageNumber = get_capi_MessageNumber();
|
tmp->MessageNumber = get_capi_MessageNumber();
|
||||||
|
|
||||||
|
#ifdef DIVA_STREAMING
|
||||||
|
tmp->diva_stream_entry = 0;
|
||||||
|
if (pbx_capi_streaming_supported (tmp) != 0) {
|
||||||
|
capi_DivaStreamingOn(tmp, 1, tmp->MessageNumber);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
capi_sendf(NULL, 0, CAPI_CONNECT_REQ, controller, tmp->MessageNumber,
|
capi_sendf(NULL, 0, CAPI_CONNECT_REQ, controller, tmp->MessageNumber,
|
||||||
"w()()()()(www()()()())()()()((wwbbb)()()())",
|
"w()()()()(www()()()())()()()((wwbbb)()()())",
|
||||||
0, 1,1,0, 3,0,0,0,0);
|
0, 1,1,0, 3,0,0,0,0);
|
||||||
|
|
Loading…
Reference in New Issue