switch (pdo->output_type) {
case SRD_OUTPUT_ANN:
/* Annotations are only fed to callbacks. */
- if ((cb = srd_find_callback(pdo->output_type))) {
+ if ((cb = srd_pd_output_callback_find(pdo->output_type))) {
/* Annotations need converting from PyObject. */
if (convert_pyobj(di, data, &pdata->ann_format,
(char ***)&pdata->data) != SRD_OK) {
if (!(py_res = PyObject_CallMethod(
next_di->py_inst, "decode", "KKO", start_sample,
end_sample, data))) {
- catch_exception("Calling %s decode(): ",
- next_di->inst_id);
+ srd_exception_catch("Calling %s decode(): ",
+ next_di->inst_id);
}
Py_XDECREF(py_res);
}
return NULL;
}
- pdo_id = pd_add(di, output_type, proto_id);
+ pdo_id = srd_inst_pd_output_add(di, output_type, proto_id);
if (pdo_id < 0)
Py_RETURN_NONE;
else