Merge lp:~ahmed-a-ammar/pigment-python/pigment-python-0.3-expose-set_from_system_buffer into lp:pigment-python/0.3

[Ahmed Ammar]

[lp:~ahmed-a-ammar/pigment-python/pigment-python-0.3-expose-set_from_system_buffer]

154. By Ahmed Ammar on 2010-07-01

Fixed CPU consumption problem. This really doesn't belong in .override
anyway. TODO.

Unmerged revisions

154. By Ahmed Ammar on 2010-07-01

Fixed CPU consumption problem. This really doesn't belong in .override
anyway. TODO.

153. By Ahmed Ammar on 2010-07-01

Expose pgm_image_set_from_system_buffer to python as
PgmImage.set_from_system_buffer. Using g_timeout_add to keep image
updated.

=== modified file 'pgm/pgm.defs'
--- pgm/pgm.defs	2009-04-27 14:50:38 +0000
+++ pgm/pgm.defs	2010-07-09 21:41:41 +0000
@@ -1705,6 +1705,19 @@
   )
 )
 
+(define-method set_from_system_buffer
+  (unblock-threads #t)
+  (of-object "PgmImage")
+  (c-name "pgm_image_set_from_system_buffer")
+  (return-type "PgmError")
+  (parameters
+    '("PgmImagePixelFormat" "format")
+    '("guint" "width")
+    '("guint" "height")
+    '("gconstpointer" "system_buffer")
+  )
+)
+
 (define-method set_from_image
   (unblock-threads #t)
   (of-object "PgmImage")

=== modified file 'pgm/pgmimage.override'
--- pgm/pgmimage.override	2008-09-17 16:25:11 +0000
+++ pgm/pgmimage.override	2010-07-09 21:41:41 +0000
@@ -1128,6 +1128,57 @@
 }
 
 %%
+override pgm_image_set_from_system_buffer kwargs
+static gboolean
+update_image (gpointer data)
+{
+  PgmDrawable *img;
+
+  img = (PgmDrawable*) data;
+
+  pgm_image_system_buffer_lock (PGM_IMAGE (img));
+  pgm_image_system_buffer_unlock (PGM_IMAGE (img));
+
+  return TRUE;
+}
+
+static PyObject *
+_wrap_pgm_image_set_from_system_buffer (PyGObject *self,
+                                     PyObject *args,
+                                     PyObject *kwargs)
+{
+  static char *kwlist[] =
+    { "format", "width", "height", "system_buffer", NULL };
+  unsigned int py_format, py_width, py_height;
+  unsigned long long py_system_buffer;
+  gint ret;
+  gconstpointer system_buffer;
+  
+  system_buffer = g_slice_new(unsigned long);
+
+  if (!PyArg_ParseTupleAndKeywords (args, kwargs,
+                                    "IIIK:PgmImage.set_image_from_system_buffer",
+                                    kwlist, &py_format, &py_width,
+                                    &py_height, &py_system_buffer))
+    return NULL;
+
+  pyg_begin_allow_threads;
+  
+  *(unsigned long*)system_buffer = py_system_buffer;
+
+  ret = pgm_image_set_from_system_buffer (PGM_IMAGE (self->obj), 
+                                          py_format, py_width, py_height, 
+                                          system_buffer);
+  
+  g_timeout_add (100, update_image, PGM_IMAGE (self->obj));
+
+  pyg_end_allow_threads;
+
+  return pyg_enum_from_gtype (PGM_TYPE_ERROR, ret);
+}
+
+
+%%
 override pgm_image_set_from_gst_buffer kwargs
 static PyObject *
 _wrap_pgm_image_set_from_gst_buffer (PyGObject *self,