also scan for video-CD content in directory MPEGAV (capitalized)

[enigma2.git] / lib / python / python.h

diff --git a/lib/python/python.h b/lib/python/python.h
index d0fe92a878c40dc560f5a46f0c080c4ead3b88de..f56d49bbc489c311c1ab1239c01d11a2ec9d730a 100644 (file)
--- a/lib/python/python.h
+++ b/lib/python/python.h
@@ -4,9 +4,9 @@
        #define __lib_python_python_class_h
 #endif
 
+#include <Python.h>
 #include <string>
 #include <lib/base/object.h>
-#include <Python.h>
 
 #if !defined(SKIP_PART1) && !defined(SWIG)
 class ePyObject
@@ -149,18 +149,7 @@ inline void ePyObject::decref()
 #endif  // !SWIG && !SKIP_PART1
 
 #ifndef SKIP_PART2
-
-class TestObj
-{
-DECLARE_REF(TestObj);
-public:
-       TestObj();
-       ~TestObj();
-};
-TEMPLATE_TYPEDEF(ePtr<TestObj>, TestObjPtr);
-
 #ifndef SWIG
-extern PyObject *New_TestObj();
 #ifdef PYTHON_REFCOUNT_DEBUG
 inline void Impl_Py_DECREF(const char* file, int line, const ePyObject &obj)
 {
@@ -233,11 +222,6 @@ inline ePyObject Impl_PyLong_FromLongLong(const char* file, int line, long long
        return ePyObject(PyLong_FromLongLong(val), file, line);
 }
 
-inline ePyObject Impl_New_TestObj(const char* file, int line)
-{
-       return ePyObject(New_TestObj(), file, line);
-}
-
 inline ePyObject Impl_PyList_GET_ITEM(const char *file, int line, ePyObject list, unsigned int pos)
 {
        return ePyObject(PyList_GET_ITEM(list, pos), file, line);
@@ -319,11 +303,6 @@ inline ePyObject Impl_PyLong_FromLongLong(long long val)
        return PyLong_FromLongLong(val);
 }
 
-inline ePyObject Impl_New_TestObj()
-{
-       return New_TestObj();
-}
-
 inline ePyObject Impl_PyList_GET_ITEM(ePyObject list, unsigned int pos)
 {
        return PyList_GET_ITEM(list, pos);
@@ -335,10 +314,16 @@ inline ePyObject Impl_PyTuple_GET_ITEM(ePyObject list, unsigned int pos)
 }
 #endif
 
+inline void Impl_INCREF(PyObject *ob)
+{
+       Py_INCREF(ob);
+}
+
 inline void Impl_DECREF(PyObject *ob)
 {
        Py_DECREF(ob);
 }
+#define Org_Py_INCREF(obj) Impl_INCREF(obj)
 #define Org_Py_DECREF(obj) Impl_DECREF(obj)
 #undef Py_DECREF
 #undef Py_XDECREF
@@ -360,7 +345,6 @@ inline void Impl_DECREF(PyObject *ob)
 #define PyLong_FromLong(val) Impl_PyLong_FromLong(__FILE__, __LINE__, val)
 #define PyLong_FromUnsignedLong(val) Impl_PyLong_FromUnsignedLong(__FILE__, __LINE__, val)
 #define PyLong_FromLongLong(val) Impl_PyLong_FromLongLong(__FILE__, __LINE__, val)
-#define NEW_TestObj(...) Impl_New_TestObj(__FILE__, __LINE__)
 #define PyList_GET_ITEM(list, pos) Impl_PyList_GET_ITEM(__FILE__, __LINE__, list, pos)
 #define PyTuple_GET_ITEM(list, pos) Impl_PyTuple_GET_ITEM(__FILE__, __LINE__, list, pos)
 #else
@@ -377,7 +361,6 @@ inline void Impl_DECREF(PyObject *ob)
 #define PyLong_FromLong(val) Impl_PyLong_FromLong(val)
 #define PyLong_FromUnsignedLong(val) Impl_PyLong_FromUnsignedLong(val)
 #define PyLong_FromLongLong(val) Impl_PyLong_FromLongLong(val)
-#define NEW_TestObj(...) Impl_New_TestObj()
 #define PyList_GET_ITEM(list, pos) Impl_PyList_GET_ITEM(list, pos)
 #define PyTuple_GET_ITEM(list, pos) Impl_PyTuple_GET_ITEM(list, pos)
 #endif
@@ -387,6 +370,7 @@ class ePython
 public:
        ePython();
        ~ePython();
+       int execFile(const char *file);
        int execute(const std::string &pythonfile, const std::string &funcname);
        static int call(ePyObject pFunc, ePyObject args);
        static ePyObject resolve(const std::string &pythonfile, const std::string &funcname);