Code cleanup to prepare CORBA module update

modules/control/corba/client.py

-#! /usr/bin/python
-
-# Simple CLI client for the corba module of vlc. Depends on pyorbit.
-# Best used with IPython (completion, ...)
-
-import sys
-import ORBit, CORBA
-
-def quit ():
-	try:
-		mc.exit()
-	except:
-		pass
-		
-print "IDL loading"
-ORBit.load_typelib ("./MediaControl.so")
-import VLC
-
-if len(sys.argv) < 1:
-	print "Usage: %s" % sys.argv[0]
-	sys.exit(1)
-
-print "ORB initialization"
-orb = CORBA.ORB_init()
-
-ior = open("/tmp/vlc-ior.ref").readline()
-mc = orb.string_to_object(ior)
-
-print "Object mc %s" % mc
-
-pos = mc.get_media_position (0,0)
-print "pos = mc.get_media_position (0,0)"
-print pos
-

modules/control/corba/launch-vlc-corba

-#! /bin/sh
-# Helper prog
-VLCPATH=/usr/local/src/vlc
-cd $VLCPATH
-${VLCPATH}/vlc --intf corba &
-exit 0
-

modules/control/corba/pyorbit-1.99.3.patch

---- pyorbit-1.99.3/src/pycorba-orb.c    2002-11-16 07:51:41.000000000 +0100
-+++ pyorbit-1.99.3-modif/src/pycorba-orb.c      2003-01-22 14:43:30.000000000 +0100
-@@ -154,6 +154,36 @@
-     return Py_None;
- }
- 
-+static PyObject *
-+pycorba_orb_work_pending(PyCORBA_ORB *self)
-+{
-+    CORBA_boolean ret;
-+    CORBA_Environment ev;
-+    PyObject *py_ret;
-+
-+    CORBA_exception_init(&ev);
-+    ret = CORBA_ORB_work_pending (self->orb, &ev);
-+
-+    if (pyorbit_check_ex(&ev))
-+        return NULL;
-+    py_ret = ret ? Py_True : Py_False;
-+    Py_INCREF(py_ret);
-+    return py_ret;
-+}
-+
-+static PyObject *
-+pycorba_orb_perform_work (PyCORBA_ORB *self)
-+{
-+    CORBA_Environment ev;
-+
-+    CORBA_exception_init(&ev);
-+    CORBA_ORB_perform_work (self->orb, &ev);
-+    if (pyorbit_check_ex(&ev))
-+       return NULL;
-+    Py_INCREF(Py_None);
-+    return Py_None;
-+}
-+
- static PyMethodDef pycorba_orb_methods[] = {
-     { "object_to_string", (PyCFunction)pycorba_orb_object_to_string, METH_VARARGS },
-     { "string_to_object", (PyCFunction)pycorba_orb_string_to_object, METH_VARARGS },
-@@ -161,6 +191,8 @@
-     { "resolve_initial_references", (PyCFunction)pycorba_orb_resolve_initial_references, METH_VARARGS },
-     { "run", (PyCFunction)pycorba_orb_run, METH_NOARGS },
-     { "shutdown", (PyCFunction)pycorba_orb_shutdown, METH_VARARGS },
-+    { "work_pending", (PyCFunction)pycorba_orb_work_pending, METH_VARARGS },
-+    { "perform_work", (PyCFunction)pycorba_orb_perform_work, METH_VARARGS },
-     { NULL, NULL, 0 }
- };
-