app.py --help works, whee !

Original commit message from CVS:
app.py --help works, whee !

diff --git a/ChangeLog b/ChangeLog
index 33851e1..1aecada 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-05  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+       * gstreamer/gstreamermodule.c: (init_gstreamer):
+          use gst_init_check () with argc and argv (see pygtk)
+
 2003-10-04  Thomas Vander Stichele  <thomas at apestaart dot org>
 
        * Makefile.am: add testsuite dir

diff --git a/gst/gstmodule.c b/gst/gstmodule.c
index cf3fb65..b89331f 100644 (file)
--- a/gst/gstmodule.c
+++ b/gst/gstmodule.c
@@ -37,9 +37,38 @@ DL_EXPORT(void)
 init_gstreamer (void)
 {
        PyObject *m, *d;
+       PyObject *av;
+        int argc, i;
+        char **argv;
 
        init_pygobject ();
-       gst_init(NULL,NULL);
+
+        /* pull in arguments */
+        av = PySys_GetObject ("argv");
+        if (av != NULL) {
+            argc = PyList_Size (av);
+            argv = g_new (char *, argc);
+            for (i = 0; i < argc; i++)
+                argv[i] = g_strdup (PyString_AsString (PyList_GetItem (av, i)));
+        } else {
+                argc = 0;
+                argv = NULL;
+        }
+                                                                                    
+        if (!gst_init_check (&argc, &argv)) {
+            if (argv != NULL) {
+                for (i = 0; i < argc; i++)
+                    g_free (argv[i]);
+                g_free (argv);
+            }
+            PyErr_SetString (PyExc_RuntimeError, "can't initialize module gstreamer");
+        }
+        if (argv != NULL) {
+            PySys_SetArgv (argc, argv);
+            for (i = 0; i < argc; i++)
+                g_free (argv[i]);
+            g_free (argv);
+        }
 
        m = Py_InitModule ("_gstreamer", pygstreamer_functions);
        d = PyModule_GetDict (m);

diff --git a/gst/gstreamermodule.c b/gst/gstreamermodule.c
index cf3fb65..b89331f 100644 (file)
--- a/gst/gstreamermodule.c
+++ b/gst/gstreamermodule.c
@@ -37,9 +37,38 @@ DL_EXPORT(void)
 init_gstreamer (void)
 {
        PyObject *m, *d;
+       PyObject *av;
+        int argc, i;
+        char **argv;
 
        init_pygobject ();
-       gst_init(NULL,NULL);
+
+        /* pull in arguments */
+        av = PySys_GetObject ("argv");
+        if (av != NULL) {
+            argc = PyList_Size (av);
+            argv = g_new (char *, argc);
+            for (i = 0; i < argc; i++)
+                argv[i] = g_strdup (PyString_AsString (PyList_GetItem (av, i)));
+        } else {
+                argc = 0;
+                argv = NULL;
+        }
+                                                                                    
+        if (!gst_init_check (&argc, &argv)) {
+            if (argv != NULL) {
+                for (i = 0; i < argc; i++)
+                    g_free (argv[i]);
+                g_free (argv);
+            }
+            PyErr_SetString (PyExc_RuntimeError, "can't initialize module gstreamer");
+        }
+        if (argv != NULL) {
+            PySys_SetArgv (argc, argv);
+            for (i = 0; i < argc; i++)
+                g_free (argv[i]);
+            g_free (argv);
+        }
 
        m = Py_InitModule ("_gstreamer", pygstreamer_functions);
        d = PyModule_GetDict (m);

diff --git a/gstreamer/gstmodule.c b/gstreamer/gstmodule.c
index cf3fb65..b89331f 100644 (file)
--- a/gstreamer/gstmodule.c
+++ b/gstreamer/gstmodule.c
@@ -37,9 +37,38 @@ DL_EXPORT(void)
 init_gstreamer (void)
 {
        PyObject *m, *d;
+       PyObject *av;
+        int argc, i;
+        char **argv;
 
        init_pygobject ();
-       gst_init(NULL,NULL);
+
+        /* pull in arguments */
+        av = PySys_GetObject ("argv");
+        if (av != NULL) {
+            argc = PyList_Size (av);
+            argv = g_new (char *, argc);
+            for (i = 0; i < argc; i++)
+                argv[i] = g_strdup (PyString_AsString (PyList_GetItem (av, i)));
+        } else {
+                argc = 0;
+                argv = NULL;
+        }
+                                                                                    
+        if (!gst_init_check (&argc, &argv)) {
+            if (argv != NULL) {
+                for (i = 0; i < argc; i++)
+                    g_free (argv[i]);
+                g_free (argv);
+            }
+            PyErr_SetString (PyExc_RuntimeError, "can't initialize module gstreamer");
+        }
+        if (argv != NULL) {
+            PySys_SetArgv (argc, argv);
+            for (i = 0; i < argc; i++)
+                g_free (argv[i]);
+            g_free (argv);
+        }
 
        m = Py_InitModule ("_gstreamer", pygstreamer_functions);
        d = PyModule_GetDict (m);

diff --git a/gstreamer/gstreamermodule.c b/gstreamer/gstreamermodule.c
index cf3fb65..b89331f 100644 (file)
--- a/gstreamer/gstreamermodule.c
+++ b/gstreamer/gstreamermodule.c
@@ -37,9 +37,38 @@ DL_EXPORT(void)
 init_gstreamer (void)
 {
        PyObject *m, *d;
+       PyObject *av;
+        int argc, i;
+        char **argv;
 
        init_pygobject ();
-       gst_init(NULL,NULL);
+
+        /* pull in arguments */
+        av = PySys_GetObject ("argv");
+        if (av != NULL) {
+            argc = PyList_Size (av);
+            argv = g_new (char *, argc);
+            for (i = 0; i < argc; i++)
+                argv[i] = g_strdup (PyString_AsString (PyList_GetItem (av, i)));
+        } else {
+                argc = 0;
+                argv = NULL;
+        }
+                                                                                    
+        if (!gst_init_check (&argc, &argv)) {
+            if (argv != NULL) {
+                for (i = 0; i < argc; i++)
+                    g_free (argv[i]);
+                g_free (argv);
+            }
+            PyErr_SetString (PyExc_RuntimeError, "can't initialize module gstreamer");
+        }
+        if (argv != NULL) {
+            PySys_SetArgv (argc, argv);
+            for (i = 0; i < argc; i++)
+                g_free (argv[i]);
+            g_free (argv);
+        }
 
        m = Py_InitModule ("_gstreamer", pygstreamer_functions);
        d = PyModule_GetDict (m);