X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=type_decoder.c;h=9cf77708dee62982fe6117db67f15afaab1767aa;hp=e5426c166f28aa87a7495aa7676be42175dfda97;hb=41e5c645a828eec6d1df30cc1e5840027cf787b2;hpb=abeeed8b6da45e1854bc151a8175836b5ca38e34

diff --git a/type_decoder.c b/type_decoder.c
index e5426c1..9cf7770 100644
--- a/type_decoder.c
+++ b/type_decoder.c
@@ -135,7 +135,7 @@ static PyObject *Decoder_put(PyObject *self, PyObject *args)
 	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) {
@@ -156,8 +156,8 @@ static PyObject *Decoder_put(PyObject *self, PyObject *args)
 			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);
 		}
@@ -193,7 +193,7 @@ static PyObject *Decoder_add(PyObject *self, PyObject *args)
 		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