Split annotation-specific output to another struct

[libsigrokdecode.git] / module_sigrokdecode.c

diff --git a/module_sigrokdecode.c b/module_sigrokdecode.c
index f88a6e97de654ca9a3f3c9f08bca0c99d74af1be..46b3ced7695db861d61acc126f473b9ec48c69cd 100644 (file)
--- a/module_sigrokdecode.c
+++ b/module_sigrokdecode.c
@@ -45,7 +45,6 @@ static struct PyModuleDef sigrokdecode_module = {
 };
 
 /** @cond PRIVATE */
-/* FIXME: SRD_PRIV causes issues on MinGW. Investigate. */
 PyMODINIT_FUNC PyInit_sigrokdecode(void)
 {
        PyObject *mod;
@@ -72,12 +71,15 @@ PyMODINIT_FUNC PyInit_sigrokdecode(void)
        /* expose output types as symbols in the sigrokdecode module */
        if (PyModule_AddIntConstant(mod, "OUTPUT_ANN", SRD_OUTPUT_ANN) == -1)
                return NULL;
-       if (PyModule_AddIntConstant(mod, "OUTPUT_PROTO",
-           SRD_OUTPUT_PROTO) == -1)
+       if (PyModule_AddIntConstant(mod, "OUTPUT_PYTHON",
+           SRD_OUTPUT_PYTHON) == -1)
                return NULL;
        if (PyModule_AddIntConstant(mod, "OUTPUT_BINARY",
            SRD_OUTPUT_BINARY) == -1)
                return NULL;
+       if (PyModule_AddIntConstant(mod, "SRD_CONF_SAMPLERATE",
+                       SRD_CONF_SAMPLERATE) == -1)
+               return NULL;
 
        mod_sigrokdecode = mod;