X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=module_sigrokdecode.c;h=46b3ced7695db861d61acc126f473b9ec48c69cd;hp=00644ccfa05b9d2bfbb7d65fefd48c7e12bc8a98;hb=4f75f1c1dfdec362514884ac4335c080b48b3d78;hpb=57790bc8c558ccf2e57b3d973c043088232628c7

diff --git a/module_sigrokdecode.c b/module_sigrokdecode.c
index 00644cc..46b3ced 100644
--- a/module_sigrokdecode.c
+++ b/module_sigrokdecode.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,8 +17,8 @@
  * 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"
 
 /** @cond PRIVATE */
@@ -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;