Move all decoder instances and callbacks into a session struct

[libsigrokdecode.git] / libsigrokdecode-internal.h

diff --git a/libsigrokdecode-internal.h b/libsigrokdecode-internal.h
index 718f11eb67ee7f7d47686e9e90b39deddaced075..2951fa35c653846728b05ce109f97a89c2c3da84 100644 (file)
--- a/libsigrokdecode-internal.h
+++ b/libsigrokdecode-internal.h
@@ -24,22 +24,35 @@
 
 #include "libsigrokdecode.h"
 
+struct srd_session {
+       int session_id;
+       uint64_t num_probes;
+       uint64_t unitsize;
+       uint64_t samplerate;
+
+       /* List of decoder instances. */
+       GSList *di_list;
+
+       /* List of frontend callbacks to receive decoder output. */
+       GSList *callbacks;
+};
+
 /*--- controller.c ----------------------------------------------------------*/
 
 SRD_PRIV int srd_decoder_searchpath_add(const char *path);
+SRD_PRIV struct srd_decoder_inst *srd_inst_find_by_obj( const GSList *stack,
+               const PyObject *obj);
 SRD_PRIV int srd_inst_start(struct srd_decoder_inst *di, PyObject *args);
 SRD_PRIV int srd_inst_decode(uint64_t start_samplenum,
                             const struct srd_decoder_inst *dec,
                             const uint8_t *inbuf, uint64_t inbuflen);
 SRD_PRIV void srd_inst_free(struct srd_decoder_inst *di);
-SRD_PRIV void srd_inst_free_all(GSList *stack);
+SRD_PRIV void srd_inst_free_all(struct srd_session *sess, GSList *stack);
+SRD_PRIV struct srd_pd_callback *srd_pd_output_callback_find(struct srd_session *sess,
+               int output_type);
 SRD_PRIV int srd_inst_pd_output_add(struct srd_decoder_inst *di,
                                    int output_type, const char *output_id);
 
-/*--- decoder.c -------------------------------------------------------------*/
-
-SRD_PRIV void *srd_pd_output_callback_find(int output_type);
-
 /*--- exception.c -----------------------------------------------------------*/
 
 SRD_PRIV void srd_exception_catch(const char *format, ...);
@@ -61,7 +74,5 @@ SRD_PRIV int py_dictitem_as_str(const PyObject *py_obj, const char *key,
                                char **outstr);
 SRD_PRIV int py_str_as_str(const PyObject *py_str, char **outstr);
 SRD_PRIV int py_strlist_to_char(const PyObject *py_strlist, char ***outstr);
-SRD_PRIV struct srd_decoder_inst *srd_inst_find_by_obj(const GSList *stack,
-                                                      const PyObject *obj);
 
 #endif