openbench-logic-sniffer: Avoid recreating event source

[libsigrok.git] / src / libsigrok-internal.h

diff --git a/src/libsigrok-internal.h b/src/libsigrok-internal.h
index 89ff993f3d5129e02a41b1c75fc3c51e76d14c5e..4f44b53b70c6a871f9aa6f435c9a6bf8ba152b1f 100644 (file)
--- a/src/libsigrok-internal.h
+++ b/src/libsigrok-internal.h
@@ -223,8 +223,6 @@ enum sr_input_meta_keys {
        SR_INPUT_META_FILESIZE = 0x02,
        /** The first 128 bytes of the file, provided as a GString. */
        SR_INPUT_META_HEADER = 0x04,
-       /** The file's MIME type. */
-       SR_INPUT_META_MIMETYPE = 0x08,
 
        /** The module cannot identify a file without this metadata. */
        SR_INPUT_META_REQUIRED = 0x80,
@@ -280,7 +278,6 @@ struct sr_input_module {
         *   SR_INPUT_META_FILENAME
         *   SR_INPUT_META_FILESIZE
         *   SR_INPUT_META_HEADER
-        *   SR_INPUT_META_MIMETYPE
         *
         * If the high bit (SR_INPUT META_REQUIRED) is set, the module cannot
         * identify a stream without the given metadata.
@@ -754,12 +751,18 @@ SR_PRIV void sr_packet_free(struct sr_datafeed_packet *packet);
 
 /*--- session_file.c --------------------------------------------------------*/
 
+#if !HAVE_ZIP_DISCARD
+/* Replace zip_discard() if not available. */
+#define zip_discard(zip) sr_zip_discard(zip)
+SR_PRIV void sr_zip_discard(struct zip *archive);
+#endif
+
 SR_PRIV GKeyFile *sr_sessionfile_read_metadata(struct zip *archive,
                        const struct zip_stat *entry);
 
 /*--- analog.c --------------------------------------------------------------*/
 
-SR_PRIV int sr_analog_init(struct sr_datafeed_analog2 *analog,
+SR_PRIV int sr_analog_init(struct sr_datafeed_analog *analog,
                            struct sr_analog_encoding *encoding,
                            struct sr_analog_meaning *meaning,
                            struct sr_analog_spec *spec,