X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=type_decoder.c;h=f689dd0f396045dfa37e484d3f7e1667df976a49;hp=be3cb31e29da5d6f5a56c32f9033773a0a1c2a65;hb=f2a5df42ea41e6c4370d4efa1a27ab942ba1ddff;hpb=361fdcaafec8ddd37f0d381204e4c2a22c56b238

diff --git a/type_decoder.c b/type_decoder.c
index be3cb31..f689dd0 100644
--- a/type_decoder.c
+++ b/type_decoder.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrokdecode project.
  *
  * Copyright (C) 2012 Bert Vermeulen <bert@biot.com>
  *
@@ -17,15 +17,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
-#include "sigrokdecode-internal.h"
+#include "libsigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
+#include "libsigrokdecode-internal.h"
 #include "config.h"
 #include <inttypes.h>
 
 /* This is only used for nicer srd_dbg() output. */
-char *OUTPUT_TYPES[] = {
+static const char *OUTPUT_TYPES[] = {
 	"OUTPUT_ANN",
-	"OUTPUT_PROTO",
+	"OUTPUT_PYTHON",
 	"OUTPUT_BINARY",
 };
 
@@ -95,7 +95,7 @@ static PyObject *Decoder_put(PyObject *self, PyObject *args)
 	struct srd_proto_data *pdata;
 	uint64_t start_sample, end_sample;
 	int output_id;
-	void (*cb)();
+	struct srd_pd_callback *cb;
 
 	if (!(di = srd_inst_find_by_obj(NULL, self))) {
 		/* Shouldn't happen. */
@@ -135,17 +135,17 @@ 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(di->sess, pdo->output_type))) {
 			/* Annotations need converting from PyObject. */
 			if (convert_pyobj(di, data, &pdata->ann_format,
 					  (char ***)&pdata->data) != SRD_OK) {
 				/* An error was already logged. */
 				break;
 			}
-			cb(pdata);
+			cb->cb(pdata, cb->cb_data);
 		}
 		break;
-	case SRD_OUTPUT_PROTO:
+	case SRD_OUTPUT_PYTHON:
 		for (l = di->next_di; l; l = l->next) {
 			next_di = l->data;
 			/* TODO: Is this needed? */
@@ -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
@@ -209,6 +209,7 @@ static PyMethodDef Decoder_methods[] = {
 	{NULL, NULL, 0, NULL}
 };
 
+/** @cond PRIVATE */
 SRD_PRIV PyTypeObject srd_Decoder_type = {
 	PyVarObject_HEAD_INIT(NULL, 0)
 	.tp_name = "sigrokdecode.Decoder",
@@ -217,3 +218,4 @@ SRD_PRIV PyTypeObject srd_Decoder_type = {
 	.tp_doc = "sigrok Decoder base class",
 	.tp_methods = Decoder_methods,
 };
+/** @endcond */