Changeset 8486 for branches/jingle

Timestamp:

08/10/07 22:01:45 (16 months ago)

Author:

liori

Message:

Jingle: still farsight -- first test program in python work

Location:

branches/jingle/src/common/farsight

Files:

• farsight.override (modified) (7 diffs)
• Makefile (modified) (1 diff)
• test.py (added)

branches/jingle/src/common/farsight/farsight.override

@@ -10 +10 @@
 #define GetLong(name)   PyInt_AsLong(PyMapping_GetItemString(item, name))
 #define GetFloat(name)  PyFloat_AsDouble(PyMapping_GetItemString(item, name))
+
+static PyObject* farsight_codec_to_dict(FarsightCodec* fc) {
+        PyObject* dict = PyDict_New();
+        PyObject* item;
+
+        PyDict_SetItemString(dict, "id",                item=PyInt_FromLong(fc->id));
+        Py_DECREF(item);
+
+        PyDict_SetItemString(dict, "encoding_name",     item=PyString_FromString(fc->encoding_name));
+        Py_DECREF(item);
+
+        PyDict_SetItemString(dict, "media_type",        item=PyInt_FromLong(fc->media_type));
+        Py_DECREF(item);
+
+        PyDict_SetItemString(dict, "clock_rate",        item=PyInt_FromLong(fc->clock_rate));
+        Py_DECREF(item);
+
+        PyDict_SetItemString(dict, "channels",          item=PyInt_FromLong(fc->channels));
+        Py_DECREF(item);
+
+        return dict;
+}
 %%
 modulename farsight
@@ -33 +55 @@
         for (tmp=list; tmp!=NULL; tmp=tmp->next) {
                 FarsightCodec *codec = tmp->data;
-                PyObject *item = pygobject_new((GObject *) codec);
+                PyObject *item = farsight_codec_to_dict(codec);
 
                 PyList_Append(ret, item);
@@ -49 +71 @@
 
         list=farsight_stream_get_local_codecs(FARSIGHT_STREAM(self->obj));
+
 
         ret=PyList_New(0);
         for (tmp=list; tmp!=NULL; tmp=g_list_next(tmp)) {
                 FarsightCodec *codec = tmp->data;
-                PyObject *item = pygobject_new((GObject *) codec);
+                PyObject *item = farsight_codec_to_dict(codec);
 
                 PyList_Append(ret, item);
@@ -136 +159 @@
         for(i=0;i<listsize;i++) {
                 FarsightTransportInfo fti;
+
                 PyObject* item = PySequence_GetItem(list, listsize-i-1);
 
@@ -147 +171 @@
                 fti.preference=GetFloat("preference");
                 fti.type=GetLong("type");
-                fti.username=GetString("username");
-                fti.password=GetString("password");
+                fti.username="";
+                fti.password="";
 
                 g_array_append_val(candidate_array, fti);
+
                 candidate_list = g_list_prepend(candidate_list,
                         &g_array_index(candidate_array, FarsightTransportInfo, i));
@@ -172 +197 @@
         PyObject* list, * item;
         GArray* codecs_array;
-        GList* codecs_list;
+        GList* codecs_list=NULL;
         int i, listsize;
 
@@ -191 +216 @@
                 fc.clock_rate = GetLong("clock_rate");
                 fc.channels = GetLong("channels");
+                fc.optional_params = NULL;
 
                 g_array_append_val(codecs_array, fc);

branches/jingle/src/common/farsight/Makefile

@@ -1 @@
-CFLAGS=`pkg-config --cflags farsight-0.1 pygtk-2.0` -I /usr/include/python2.5 -I. -I farsight/
+CFLAGS=-g `pkg-config --cflags farsight-0.1 pygtk-2.0` -I /usr/include/python2.5 -I. -I farsight/
 LDFLAGS=`pkg-config --libs farsight-0.1`