r2chan.h   r2chan.h 
skipping to change at line 91 skipping to change at line 91
int openr2_chan_set_blocked(openr2_chan_t *r2chan); int openr2_chan_set_blocked(openr2_chan_t *r2chan);
int openr2_chan_handle_cas(openr2_chan_t *r2chan); int openr2_chan_handle_cas(openr2_chan_t *r2chan);
const char *openr2_chan_get_rx_cas_string(openr2_chan_t *r2chan); const char *openr2_chan_get_rx_cas_string(openr2_chan_t *r2chan);
const char *openr2_chan_get_tx_cas_string(openr2_chan_t *r2chan); const char *openr2_chan_get_tx_cas_string(openr2_chan_t *r2chan);
const char *openr2_chan_get_call_state_string(openr2_chan_t *r2chan); const char *openr2_chan_get_call_state_string(openr2_chan_t *r2chan);
const char *openr2_chan_get_r2_state_string(openr2_chan_t *r2chan); const char *openr2_chan_get_r2_state_string(openr2_chan_t *r2chan);
const char *openr2_chan_get_mf_state_string(openr2_chan_t *r2chan); const char *openr2_chan_get_mf_state_string(openr2_chan_t *r2chan);
const char *openr2_chan_get_mf_group_string(openr2_chan_t *r2chan); const char *openr2_chan_get_mf_group_string(openr2_chan_t *r2chan);
int openr2_chan_get_tx_mf_signal(openr2_chan_t *r2chan); int openr2_chan_get_tx_mf_signal(openr2_chan_t *r2chan);
int openr2_chan_get_rx_mf_signal(openr2_chan_t *r2chan); int openr2_chan_get_rx_mf_signal(openr2_chan_t *r2chan);
int openr2_chan_set_dtmf_write_handle(openr2_chan_t *r2chan, void *dtmf_wri te_handle); int openr2_chan_set_dtmf_handles(openr2_chan_t *r2chan, void *dtmf_read_han dle, void *dtmf_write_handle);
#ifdef __OR2_COMPILING_LIBRARY__ #ifdef __OR2_COMPILING_LIBRARY__
#undef openr2_chan_t #undef openr2_chan_t
#undef openr2_context_t #undef openr2_context_t
#endif #endif
#if defined(__cplusplus) #if defined(__cplusplus)
} /* endif extern "C" */ } /* endif extern "C" */
#endif #endif
#endif /* endif defined _OPENR2_CHAN_H_ */ #endif /* endif defined _OPENR2_CHAN_H_ */
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 r2context.h   r2context.h 
skipping to change at line 162 skipping to change at line 162
/* Transcoding interface. Users should provide this interface /* Transcoding interface. Users should provide this interface
to provide transcoding services from linear to alaw and to provide transcoding services from linear to alaw and
viceversa */ viceversa */
typedef int16_t (*openr2_alaw_to_linear_func)(uint8_t alaw); typedef int16_t (*openr2_alaw_to_linear_func)(uint8_t alaw);
typedef uint8_t (*openr2_linear_to_alaw_func)(int linear); typedef uint8_t (*openr2_linear_to_alaw_func)(int linear);
typedef struct { typedef struct {
openr2_alaw_to_linear_func alaw_to_linear; openr2_alaw_to_linear_func alaw_to_linear;
openr2_linear_to_alaw_func linear_to_alaw; openr2_linear_to_alaw_func linear_to_alaw;
} openr2_transcoder_interface_t; } openr2_transcoder_interface_t;
/* DTMF transmitter interface */ /* DTMF transmitter part of the openr2_dtmf_interface_t */
typedef void *(*openr2_dtmf_tx_init_func)(void *dtmf_write_handle); typedef void *(*openr2_dtmf_tx_init_func)(void *dtmf_write_handle);
typedef void (*openr2_dtmf_tx_set_timing_func)(void *dtmf_write_handle, int on_time, int off_time); typedef void (*openr2_dtmf_tx_set_timing_func)(void *dtmf_write_handle, int on_time, int off_time);
typedef int (*openr2_dtmf_tx_put_func)(void *dtmf_write_handle, const char *digits, int len); typedef int (*openr2_dtmf_tx_put_func)(void *dtmf_write_handle, const char *digits, int len);
typedef int (*openr2_dtmf_tx_func)(void *dtmf_write_handle, int16_t amp[], int max_samples); typedef int (*openr2_dtmf_tx_func)(void *dtmf_write_handle, int16_t amp[], int max_samples);
/* DTMF receiver part of the openr2_dtmf_interface_t */
typedef void (*openr2_digits_rx_callback_t)(void *user_data, const char *di
gits, int len);
typedef void *(*openr2_dtmf_rx_init_func)(void *dtmf_read_handle, openr2_di
gits_rx_callback_t callback, void *user_data);
typedef int (*openr2_dtmf_rx_status_func)(void *dtmf_read_handle);
typedef int (*openr2_dtmf_rx_func)(void *dtmf_read_handle, const int16_t am
p[], int samples);
typedef struct { typedef struct {
/* DTMF Transmitter */
openr2_dtmf_tx_init_func dtmf_tx_init; openr2_dtmf_tx_init_func dtmf_tx_init;
openr2_dtmf_tx_set_timing_func dtmf_tx_set_timing; openr2_dtmf_tx_set_timing_func dtmf_tx_set_timing;
openr2_dtmf_tx_put_func dtmf_tx_put; openr2_dtmf_tx_put_func dtmf_tx_put;
openr2_dtmf_tx_func dtmf_tx; openr2_dtmf_tx_func dtmf_tx;
/* DTMF Detector */
openr2_dtmf_rx_init_func dtmf_rx_init;
openr2_dtmf_rx_status_func dtmf_rx_status;
openr2_dtmf_rx_func dtmf_rx;
} openr2_dtmf_interface_t; } openr2_dtmf_interface_t;
/* Library errors */ /* Library errors */
typedef enum { typedef enum {
/* Failed system call */ /* Failed system call */
OR2_LIBERR_SYSCALL_FAILED, OR2_LIBERR_SYSCALL_FAILED,
/* Invalid channel signaling when creating it */ /* Invalid channel signaling when creating it */
OR2_LIBERR_INVALID_CHAN_SIGNALING, OR2_LIBERR_INVALID_CHAN_SIGNALING,
/* cannot set to IDLE the channel when creating it */ /* cannot set to IDLE the channel when creating it */
OR2_LIBERR_CANNOT_SET_IDLE OR2_LIBERR_CANNOT_SET_IDLE
skipping to change at line 213 skipping to change at line 225
int openr2_context_get_mf_threshold(openr2_context_t *r2context); int openr2_context_get_mf_threshold(openr2_context_t *r2context);
int openr2_context_set_log_directory(openr2_context_t *r2context, char *dir ectory); int openr2_context_set_log_directory(openr2_context_t *r2context, char *dir ectory);
char *openr2_context_get_log_directory(openr2_context_t *r2context, char *d irectory, int len); char *openr2_context_get_log_directory(openr2_context_t *r2context, char *d irectory, int len);
void openr2_context_set_mf_back_timeout(openr2_context_t *r2context, int ms ); void openr2_context_set_mf_back_timeout(openr2_context_t *r2context, int ms );
int openr2_context_get_mf_back_timeout(openr2_context_t *r2context); int openr2_context_get_mf_back_timeout(openr2_context_t *r2context);
void openr2_context_set_metering_pulse_timeout(openr2_context_t *r2context, int ms); void openr2_context_set_metering_pulse_timeout(openr2_context_t *r2context, int ms);
int openr2_context_get_metering_pulse_timeout(openr2_context_t *r2context); int openr2_context_get_metering_pulse_timeout(openr2_context_t *r2context);
void openr2_context_set_double_answer(openr2_context_t *r2context, int enab le); void openr2_context_set_double_answer(openr2_context_t *r2context, int enab le);
int openr2_context_get_double_answer(openr2_context_t *r2context); int openr2_context_get_double_answer(openr2_context_t *r2context);
int openr2_context_configure_from_advanced_file(openr2_context_t *r2context , const char *filename); int openr2_context_configure_from_advanced_file(openr2_context_t *r2context , const char *filename);
void openr2_context_set_dtmf_detection(openr2_context_t *r2context, int ena
ble);
int openr2_context_get_dtmf_detection(openr2_context_t *r2context);
void openr2_context_set_dtmf_dialing(openr2_context_t *r2context, int enabl e, int dtmf_on, int dtmf_off); void openr2_context_set_dtmf_dialing(openr2_context_t *r2context, int enabl e, int dtmf_on, int dtmf_off);
int openr2_context_get_dtmf_dialing(openr2_context_t *r2context, int *dtmf_ on, int *dtmf_off); int openr2_context_get_dtmf_dialing(openr2_context_t *r2context, int *dtmf_ on, int *dtmf_off);
int openr2_context_set_dtmf_interface(openr2_context_t *r2context, openr2_d tmf_interface_t *dtmf_interface); int openr2_context_set_dtmf_interface(openr2_context_t *r2context, openr2_d tmf_interface_t *dtmf_interface);
#ifdef __OR2_COMPILING_LIBRARY__ #ifdef __OR2_COMPILING_LIBRARY__
#undef openr2_chan_t #undef openr2_chan_t
#undef openr2_context_t #undef openr2_context_t
#endif #endif
#if defined(__cplusplus) #if defined(__cplusplus)
 End of changes. 5 change blocks. 
1 lines changed or deleted 19 lines changed or added


 r2proto.h   r2proto.h 
skipping to change at line 169 skipping to change at line 169
OR2_ANSWER_TIMEOUT, OR2_ANSWER_TIMEOUT,
OR2_INVALID_R2_STATE, OR2_INVALID_R2_STATE,
OR2_INVALID_MF_STATE, OR2_INVALID_MF_STATE,
OR2_INVALID_MF_GROUP, OR2_INVALID_MF_GROUP,
OR2_LIBRARY_BUG, OR2_LIBRARY_BUG,
OR2_INTERNAL_ERROR OR2_INTERNAL_ERROR
} openr2_protocol_error_t; } openr2_protocol_error_t;
/* possible calling party categories */ /* possible calling party categories */
typedef enum { typedef enum {
OR2_CALLING_PARTY_CATEGORY_NATIONAL_SUBSCRIBER, OR2_CALLING_PARTY_CATEGORY_NATIONAL_SUBSCRIBER = 0,
OR2_CALLING_PARTY_CATEGORY_NATIONAL_PRIORITY_SUBSCRIBER, OR2_CALLING_PARTY_CATEGORY_NATIONAL_PRIORITY_SUBSCRIBER,
OR2_CALLING_PARTY_CATEGORY_INTERNATIONAL_SUBSCRIBER, OR2_CALLING_PARTY_CATEGORY_INTERNATIONAL_SUBSCRIBER,
OR2_CALLING_PARTY_CATEGORY_INTERNATIONAL_PRIORITY_SUBSCRIBER, OR2_CALLING_PARTY_CATEGORY_INTERNATIONAL_PRIORITY_SUBSCRIBER,
OR2_CALLING_PARTY_CATEGORY_COLLECT_CALL, OR2_CALLING_PARTY_CATEGORY_COLLECT_CALL,
OR2_CALLING_PARTY_CATEGORY_UNKNOWN OR2_CALLING_PARTY_CATEGORY_UNKNOWN,
OR2_CALLING_PARTY_CATEGORY_TEST_EQUIPMENT
} openr2_calling_party_category_t; } openr2_calling_party_category_t;
const char *openr2_proto_get_error(openr2_protocol_error_t reason); const char *openr2_proto_get_error(openr2_protocol_error_t reason);
const char *openr2_proto_get_disconnect_string(openr2_call_disconnect_cause _t cause); const char *openr2_proto_get_disconnect_string(openr2_call_disconnect_cause _t cause);
const char *openr2_proto_get_category_string(openr2_calling_party_category_ t category); const char *openr2_proto_get_category_string(openr2_calling_party_category_ t category);
openr2_calling_party_category_t openr2_proto_get_category(const char *categ ory); openr2_calling_party_category_t openr2_proto_get_category(const char *categ ory);
const char *openr2_proto_get_variant_string(openr2_variant_t variant); const char *openr2_proto_get_variant_string(openr2_variant_t variant);
openr2_variant_t openr2_proto_get_variant(const char *variant); openr2_variant_t openr2_proto_get_variant(const char *variant);
const char *openr2_proto_get_call_mode_string(openr2_call_mode_t mode); const char *openr2_proto_get_call_mode_string(openr2_call_mode_t mode);
const openr2_variant_entry_t *openr2_proto_get_variant_list(int *numvariant s); const openr2_variant_entry_t *openr2_proto_get_variant_list(int *numvariant s);
 End of changes. 2 change blocks. 
2 lines changed or deleted 3 lines changed or added


 r2utils.h   r2utils.h 
skipping to change at line 29 skipping to change at line 29
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
*/ */
#ifndef _OPENR2_UTILS_H_ #ifndef _OPENR2_UTILS_H_
#define _OPENR2_UTILS_H_ #define _OPENR2_UTILS_H_
#if defined(__cplusplus) #if defined(__cplusplus)
extern "C" { extern "C" {
#endif #endif
#define OR2_LIB_INTERFACE 2 #define OR2_LIB_INTERFACE 3
#define OR2_LIB_REVISION 0 #define OR2_LIB_REVISION 0
#define OR2_LIB_AGE 1 #define OR2_LIB_AGE 0
const char *openr2_get_version(void); const char *openr2_get_version(void);
const char *openr2_get_revision(void); const char *openr2_get_revision(void);
int openr2_strncasecmp(const char *s1, const char *s2, size_t n); int openr2_strncasecmp(const char *s1, const char *s2, size_t n);
#if defined(__cplusplus) #if defined(__cplusplus)
} /* endif extern "C" */ } /* endif extern "C" */
#endif #endif
#endif /* endif defined _OPENR2_UTILS_H_ */ #endif /* endif defined _OPENR2_UTILS_H_ */
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/