X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=libsigrokdecode.h.in;h=3eaace655d6e1cc28cafc1c10f8d730a747e7973;hp=97ffa1d0f4c9464eb69d31f55709b62f89e8c160;hb=8915b34659332288aab38780d8f10d75c4c83e7f;hpb=47dfa77d472795e6b5ad2ec3f3588a9619aec70f

diff --git a/libsigrokdecode.h.in b/libsigrokdecode.h.in
index 97ffa1d..3eaace6 100644
--- a/libsigrokdecode.h.in
+++ b/libsigrokdecode.h.in
@@ -30,6 +30,8 @@
 extern "C" {
 #endif
 
+struct srd_session;
+
 /**
  * @file
  *
@@ -164,6 +166,10 @@ enum {
 
 #define SRD_MAX_NUM_PROBES 64
 
+enum {
+	SRD_CONF_SAMPLERATE = 10000,
+};
+
 struct srd_decoder {
 	/** The decoder ID. Must be non-NULL and unique for all decoders. */
 	char *id;
@@ -228,14 +234,13 @@ struct srd_decoder_option {
 
 struct srd_decoder_inst {
 	struct srd_decoder *decoder;
+	struct srd_session *sess;
 	PyObject *py_inst;
 	char *inst_id;
 	GSList *pd_output;
 	int dec_num_probes;
 	int *dec_probemap;
-	int data_num_probes;
 	int data_unitsize;
-	uint64_t data_samplerate;
 	GSList *next_di;
 };
 
@@ -287,16 +292,22 @@ SRD_API int srd_inst_option_set(struct srd_decoder_inst *di,
 		GHashTable *options);
 SRD_API int srd_inst_probe_set_all(struct srd_decoder_inst *di,
 		GHashTable *probes);
-SRD_API struct srd_decoder_inst *srd_inst_new(const char *id,
-		GHashTable *options);
-SRD_API int srd_inst_stack(struct srd_decoder_inst *di_from,
-		struct srd_decoder_inst *di_to);
-SRD_API struct srd_decoder_inst *srd_inst_find_by_id(const char *inst_id);
-SRD_API int srd_session_start(int num_probes, int unitsize, uint64_t samplerate);
-SRD_API int srd_session_send(uint64_t start_samplenum, const uint8_t *inbuf,
-		uint64_t inbuflen);
-SRD_API int srd_pd_output_callback_add(int output_type,
-		srd_pd_output_callback_t cb, void *cb_data);
+SRD_API struct srd_decoder_inst *srd_inst_new(struct srd_session *sess,
+		const char *id, GHashTable *options);
+SRD_API int srd_inst_stack(struct srd_session *sess,
+		struct srd_decoder_inst *di_from, struct srd_decoder_inst *di_to);
+SRD_API struct srd_decoder_inst *srd_inst_find_by_id(struct srd_session *sess,
+		const char *inst_id);
+SRD_API int srd_session_new(struct srd_session **sess);
+SRD_API int srd_session_start(struct srd_session *sess);
+SRD_API int srd_session_metadata_set(struct srd_session *sess, int key,
+		GVariant *data);
+SRD_API int srd_session_send(struct srd_session *sess,
+		uint64_t start_samplenum, uint64_t end_samplenum,
+		const uint8_t *inbuf, uint64_t inbuflen);
+SRD_API int srd_session_destroy(struct srd_session *sess);
+SRD_API int srd_pd_output_callback_add(struct srd_session *sess,
+		int output_type, srd_pd_output_callback_t cb, void *cb_data);
 
 /*--- decoder.c -------------------------------------------------------------*/