X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=decode.c;h=ab412f6860b3ba545c68c2b4890757a0c20c1df4;hp=de37913cddf9bd13d0f7be8e754b34bb473a5827;hb=33e72c5440ab5973bcb99b5c133e0cdcf15636e8;hpb=910e5fd8a73ac006bd5fa341b3f3cf3d9318b4f0 diff --git a/decode.c b/decode.c index de37913..ab412f6 100644 --- a/decode.c +++ b/decode.c @@ -31,13 +31,14 @@ int sigrokdecode_init(void) /* Py_Initialize() returns void and usually cannot fail. */ Py_Initialize(); - /* FIXME */ - /* Allows for ./gui/sigrok-gui in the top-level directory. */ - PySys_SetPath("libsigrokdecode/scripts"); - /* Allows for ./sigrok-gui in the gui/ directory. */ - PySys_SetPath("../libsigrokdecode/scripts"); - /* Allows for sigrok-gui from anywhere given sigrok is installed. */ - PySys_SetPath("/usr/local/share/sigrok"); + /* Add some more search directories for convenience. */ + /* FIXME: Check error code. */ + PyRun_SimpleString( + "import sys;" + "sys.path.append('libsigrokdecode/scripts');" + "sys.path.append('../libsigrokdecode/scripts');" + "sys.path.append('/usr/local/share/sigrok');" + ); return 0; } @@ -72,6 +73,7 @@ int sigrokdecode_run_decoder(const char *decodername, uint8_t *inbuf, uint64_t *outbuflen) { const char *decoder_filename = "transitioncounter"; /* FIXME */ + // const char *decoder_filename = "i2c"; /* FIXME */ PyObject *py_name, *py_module, *py_func, *py_args; PyObject *py_value, *py_result; int ret;