add auto vcr switching support (needs new drivers (fp.ko))

[vuplus_dvbapp] / lib / python / python.cpp

diff --git a/lib/python/python.cpp b/lib/python/python.cpp
index a1ef150..119bff1 100644 (file)
--- a/lib/python/python.cpp
+++ b/lib/python/python.cpp
@@ -1,8 +1,24 @@
 #include <lib/python/python.h>
 #include <lib/base/eerror.h>
+                /* avoid warnigs :) */
+#undef _POSIX_C_SOURCE
+#define _POSIX_C_SOURCE 200112L
 #include <Python.h>
 
 extern "C" void init_enigma();
+extern void bsodFatal();
+
+DEFINE_REF(TestObj);
+
+TestObj::TestObj()
+{
+       eDebug("create %p", this);
+}
+
+TestObj::~TestObj()
+{
+       eDebug("destroy %p", this);
+}
 
 #if 0
 ePyObject::ePyObject(void *ptr): m_object(ptr)
@@ -44,6 +60,10 @@ ePyObject &ePyObject::operator=(void *object)
 
 ePython::ePython()
 {
+//     Py_VerboseFlag = 1;
+       
+//     Py_OptimizeFlag = 1;
+       
        Py_Initialize();
        
        init_enigma();
@@ -57,9 +77,8 @@ ePython::~ePython()
 int ePython::execute(const std::string &pythonfile, const std::string &funcname)
 {
        PyObject *pName, *pModule, *pDict, *pFunc, *pArgs, *pValue;
-       
        pName = PyString_FromString(pythonfile.c_str());
-       
+
        pModule = PyImport_Import(pName);
        Py_DECREF(pName);
        
@@ -104,11 +123,15 @@ int ePython::call(PyObject *pFunc, PyObject *pArgs)
                pValue = PyObject_CallObject(pFunc, pArgs);
                if (pValue != NULL)
                {
-                       res = PyInt_AsLong(pValue);
+                       if (PyInt_Check(pValue))
+                               res = PyInt_AsLong(pValue);
+                       else
+                               res = 0;
                        Py_DECREF(pValue);
                } else
                {
                        PyErr_Print();
+                       bsodFatal();
                }
        }
        return res;
@@ -129,7 +152,6 @@ PyObject *ePython::resolve(const std::string &pythonfile, const std::string &fun
                pFunc = PyDict_GetItemString(pDict, funcname.c_str());
                Py_XINCREF(pFunc);
                Py_DECREF(pModule);
-               eDebug("resolved to %p", pFunc);
                return pFunc;
        } else
        {