First step at wrapping base elements in gst-python

Original commit message from CVS:
First step at wrapping base elements in gst-python
* configure.ac:
Commenting out weird debugging statement dating from gst-python's
and which causes problems with gstbasesrc.h anonymous union.
* gst/Makefile.am:
Added base.defs
* gst/base.defs:
New base elements definition files
* gst/gst.defs:
* gst/gst.override:
Add base elements

diff --git a/ChangeLog b/ChangeLog
index 110ee17..42394bd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2006-01-01  Edward Hervey  <edward@fluendo.com>
+
+       First step at wrapping base elements in gst-python
+       
+       * configure.ac:
+       Commenting out weird debugging statement dating from gst-python's
+       and which causes problems with gstbasesrc.h anonymous union.
+       * gst/Makefile.am:
+       Added base.defs
+       * gst/base.defs:
+       New base elements definition files
+       * gst/gst.defs:
+       * gst/gst.override:
+       Add base elements
+
 === release 0.10.1 ===
 
 2005-12-23  Thomas Vander Stichele <thomas at apestaart dot org>

diff --git a/configure.ac b/configure.ac
index 9699a22..fa8a880 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -144,19 +144,19 @@ AS_AC_EXPAND(PYTHONDIR, $pythondir)
 AS_AC_EXPAND(PYEXECDIR, $pyexecdir)
 
 dnl add debugging options ...
-changequote(,)dnl
-if test "x$GCC" = xyes; then
-  case " $CFLAGS " in
-  *[\  \ ]-Wall[\      \ ]*) ;;
-  *) CFLAGS="$CFLAGS -Wall" ;;
-  esac
-
-  case " $CFLAGS " in
-  *[\  \ ]-std=c9x[\   \ ]*) ;;
-  *) CFLAGS="$CFLAGS -std=c9x" ;;
-  esac
-fi
-changequote([,])dnl
+# changequote(,)dnl
+# if test "x$GCC" = xyes; then
+#   case " $CFLAGS " in
+#   *[\        \ ]-Wall[\      \ ]*) ;;
+#   *) CFLAGS="$CFLAGS -Wall" ;;
+#   esac
+
+#   case " $CFLAGS " in
+#   *[\        \ ]-std=c9x[\   \ ]*) ;;
+#   *) CFLAGS="$CFLAGS -std=c9x" ;;
+#   esac
+# fi
+# changequote([,])dnl
 
 GST_VALGRIND_CHECK()
 

diff --git a/gst/Makefile.am b/gst/Makefile.am
index 524e82b..3a28262 100644 (file)
--- a/gst/Makefile.am
+++ b/gst/Makefile.am
@@ -16,7 +16,8 @@ interface_lib = interfaces.la
 
 defs_DATA = gst-types.defs \
        gst-extrafuncs.defs \
-       libs.defs
+       libs.defs \
+       base.defs
 defsdir = $(pkgdatadir)/$(GST_MAJORMINOR)/defs
 
 noinst_HEADERS = common.h pygstvalue.h pygstminiobject.h pygstobject.h pygstexception.h
@@ -24,11 +25,11 @@ noinst_HEADERS = common.h pygstvalue.h pygstminiobject.h pygstobject.h pygstexce
 INCLUDES = $(PYTHON_INCLUDES)
 EXTRA_DIST = $(defs_DATA) common.h arg-types.py
 PYGTK_DEFSDIR = @PYGTK_DEFSDIR@
-GEN_FILES = arg-types.py gst-types.defs libs.defs
+GEN_FILES = arg-types.py gst-types.defs libs.defs base.defs
 
 # GStreamer bindings
 _gst_la_CFLAGS = $(common_cflags)
-_gst_la_LIBADD = $(common_libadd)
+_gst_la_LIBADD = $(common_libadd) $(GST_BASE_LIBS)
 _gst_la_LDFLAGS = $(common_ldflags) -export-symbols-regex init_gst \
        $(GST_BASE_LIBS) $(GST_CONTROLLER_LIBS) $(GST_NET_LIBS)
 _gst_la_SOURCES =              \
@@ -58,7 +59,7 @@ GST_OVERRIDES =               \
        gsttaglist.override     \
        gstlibs.override
 
-GST_DEFS = gst.defs gst-types.defs gst-extrafuncs.defs libs.defs
+GST_DEFS = gst.defs gst-types.defs gst-extrafuncs.defs libs.defs base.defs
 CLEANFILES = gst.c
 EXTRA_DIST += $(GST_DEFS) $(GST_OVERRIDES)
 gst.c: $(GST_DEFS) $(GST_OVERRIDES) $(GEN_FILES)

diff --git a/gst/base.defs b/gst/base.defs
new file mode 100644 (file)
index 0000000..1383f86
--- /dev/null
+++ b/gst/base.defs
@@ -0,0 +1,354 @@
+;; -*- scheme -*-
+; object definitions ...
+(define-object Adapter
+  (in-module "Gst")
+  (parent "GObject")
+  (c-name "GstAdapter")
+  (gtype-id "GST_TYPE_ADAPTER")
+)
+
+(define-object BaseSink
+  (in-module "Gst")
+  (parent "GstElement")
+  (c-name "GstBaseSink")
+  (gtype-id "GST_TYPE_BASE_SINK")
+)
+
+(define-object BaseSrc
+  (in-module "Gst")
+  (parent "GstElement")
+  (c-name "GstBaseSrc")
+  (gtype-id "GST_TYPE_BASE_SRC")
+)
+
+(define-object BaseTransform
+  (in-module "Gst")
+  (parent "GstElement")
+  (c-name "GstBaseTransform")
+  (gtype-id "GST_TYPE_BASE_TRANSFORM")
+)
+
+(define-object CollectPads
+  (in-module "Gst")
+  (parent "GstObject")
+  (c-name "GstCollectPads")
+  (gtype-id "GST_TYPE_COLLECT_PADS")
+)
+
+(define-object PushSrc
+  (in-module "Gst")
+  (parent "GstBaseSrc")
+  (c-name "GstPushSrc")
+  (gtype-id "GST_TYPE_PUSH_SRC")
+)
+
+;; Enumerations and flags ...
+
+; (define-flags BaseSrcFlags
+;   (in-module "Gst")
+;   (c-name "GstBaseSrcFlags")
+;   (gtype-id "GST_TYPE_BASE_SRC_FLAGS")
+;   (values
+;     '("started" "GST_BASE_SRC_STARTED")
+;     '("flag-last" "GST_BASE_SRC_FLAG_LAST")
+;   )
+; )
+
+
+;; From ../gstreamer/libs/gst/base/gstadapter.h
+
+(define-function gst_adapter_new
+  (c-name "gst_adapter_new")
+  (is-constructor-of "GstAdapter")
+  (return-type "GstAdapter*")
+)
+
+(define-method clear
+  (of-object "GstAdapter")
+  (c-name "gst_adapter_clear")
+  (return-type "none")
+)
+
+(define-method push
+  (of-object "GstAdapter")
+  (c-name "gst_adapter_push")
+  (return-type "none")
+  (parameters
+    '("GstBuffer*" "buf")
+  )
+)
+
+(define-method peek
+  (of-object "GstAdapter")
+  (c-name "gst_adapter_peek")
+  (return-type "const-guint8*")
+  (parameters
+    '("guint" "size")
+  )
+)
+
+(define-method flush
+  (of-object "GstAdapter")
+  (c-name "gst_adapter_flush")
+  (return-type "none")
+  (parameters
+    '("guint" "flush")
+  )
+)
+
+(define-method take
+  (of-object "GstAdapter")
+  (c-name "gst_adapter_take")
+  (return-type "guint8*")
+  (parameters
+    '("guint" "nbytes")
+  )
+)
+
+(define-method available
+  (of-object "GstAdapter")
+  (c-name "gst_adapter_available")
+  (return-type "guint")
+)
+
+(define-method available_fast
+  (of-object "GstAdapter")
+  (c-name "gst_adapter_available_fast")
+  (return-type "guint")
+)
+
+(define-function gst_adapter_get_type
+  (c-name "gst_adapter_get_type")
+  (return-type "GType")
+)
+
+
+
+;; From ../gstreamer/libs/gst/base/gstbasesink.h
+
+(define-function gst_base_sink_get_type
+  (c-name "gst_base_sink_get_type")
+  (return-type "GType")
+)
+
+
+
+;; From ../gstreamer/libs/gst/base/gstbasesrc.h
+
+(define-function gst_base_src_get_type
+  (c-name "gst_base_src_get_type")
+  (return-type "GType")
+)
+
+(define-method set_live
+  (of-object "GstBaseSrc")
+  (c-name "gst_base_src_set_live")
+  (return-type "none")
+  (parameters
+    '("gboolean" "live")
+  )
+)
+
+(define-method is_live
+  (of-object "GstBaseSrc")
+  (c-name "gst_base_src_is_live")
+  (return-type "gboolean")
+)
+
+(define-method set_format
+  (of-object "GstBaseSrc")
+  (c-name "gst_base_src_set_format")
+  (return-type "none")
+  (parameters
+    '("GstFormat" "format")
+  )
+)
+
+
+
+;; From ../gstreamer/libs/gst/base/gstbasetransform.h
+
+(define-function gst_base_transform_get_type
+  (c-name "gst_base_transform_get_type")
+  (return-type "GType")
+)
+
+(define-method set_passthrough
+  (of-object "GstBaseTransform")
+  (c-name "gst_base_transform_set_passthrough")
+  (return-type "none")
+  (parameters
+    '("gboolean" "passthrough")
+  )
+)
+
+(define-method is_passthrough
+  (of-object "GstBaseTransform")
+  (c-name "gst_base_transform_is_passthrough")
+  (return-type "gboolean")
+)
+
+(define-method set_in_place
+  (of-object "GstBaseTransform")
+  (c-name "gst_base_transform_set_in_place")
+  (return-type "none")
+  (parameters
+    '("gboolean" "in_place")
+  )
+)
+
+(define-method is_in_place
+  (of-object "GstBaseTransform")
+  (c-name "gst_base_transform_is_in_place")
+  (return-type "gboolean")
+)
+
+
+
+;; From ../gstreamer/libs/gst/base/gstcollectpads.h
+
+(define-function gst_collect_pads_get_type
+  (c-name "gst_collect_pads_get_type")
+  (return-type "GType")
+)
+
+(define-function gst_collect_pads_new
+  (c-name "gst_collect_pads_new")
+  (is-constructor-of "GstCollectPads")
+  (return-type "GstCollectPads*")
+)
+
+(define-method set_function
+  (of-object "GstCollectPads")
+  (c-name "gst_collect_pads_set_function")
+  (return-type "none")
+  (parameters
+    '("GstCollectPadsFunction" "func")
+    '("gpointer" "user_data")
+  )
+)
+
+(define-method add_pad
+  (of-object "GstCollectPads")
+  (c-name "gst_collect_pads_add_pad")
+  (return-type "GstCollectData*")
+  (parameters
+    '("GstPad*" "pad")
+    '("guint" "size")
+  )
+)
+
+(define-method remove_pad
+  (of-object "GstCollectPads")
+  (c-name "gst_collect_pads_remove_pad")
+  (return-type "gboolean")
+  (parameters
+    '("GstPad*" "pad")
+  )
+)
+
+(define-method is_active
+  (of-object "GstCollectPads")
+  (c-name "gst_collect_pads_is_active")
+  (return-type "gboolean")
+  (parameters
+    '("GstPad*" "pad")
+  )
+)
+
+(define-method collect
+  (of-object "GstCollectPads")
+  (c-name "gst_collect_pads_collect")
+  (return-type "GstFlowReturn")
+)
+
+(define-method collect_range
+  (of-object "GstCollectPads")
+  (c-name "gst_collect_pads_collect_range")
+  (return-type "GstFlowReturn")
+  (parameters
+    '("guint64" "offset")
+    '("guint" "length")
+  )
+)
+
+(define-method start
+  (of-object "GstCollectPads")
+  (c-name "gst_collect_pads_start")
+  (return-type "none")
+)
+
+(define-method stop
+  (of-object "GstCollectPads")
+  (c-name "gst_collect_pads_stop")
+  (return-type "none")
+)
+
+(define-method peek
+  (of-object "GstCollectPads")
+  (c-name "gst_collect_pads_peek")
+  (return-type "GstBuffer*")
+  (parameters
+    '("GstCollectData*" "data")
+  )
+)
+
+(define-method pop
+  (of-object "GstCollectPads")
+  (c-name "gst_collect_pads_pop")
+  (return-type "GstBuffer*")
+  (parameters
+    '("GstCollectData*" "data")
+  )
+)
+
+(define-method available
+  (of-object "GstCollectPads")
+  (c-name "gst_collect_pads_available")
+  (return-type "guint")
+)
+
+(define-method read
+  (of-object "GstCollectPads")
+  (c-name "gst_collect_pads_read")
+  (return-type "guint")
+  (parameters
+    '("GstCollectData*" "data")
+    '("guint8**" "bytes")
+    '("guint" "size")
+  )
+)
+
+(define-method flush
+  (of-object "GstCollectPads")
+  (c-name "gst_collect_pads_flush")
+  (return-type "guint")
+  (parameters
+    '("GstCollectData*" "data")
+    '("guint" "size")
+  )
+)
+
+
+
+;; From ../gstreamer/libs/gst/base/gstpushsrc.h
+
+(define-function gst_push_src_get_type
+  (c-name "gst_push_src_get_type")
+  (return-type "GType")
+)
+
+
+
+;; From ../gstreamer/libs/gst/base/gsttypefindhelper.h
+
+(define-function gst_type_find_helper
+  (c-name "gst_type_find_helper")
+  (return-type "GstCaps*")
+  (parameters
+    '("GstPad*" "src")
+    '("guint64" "size")
+  )
+)
+
+

diff --git a/gst/gst.defs b/gst/gst.defs
index 4a7bc1a..b6aa6be 100644 (file)
--- a/gst/gst.defs
+++ b/gst/gst.defs
@@ -3,6 +3,7 @@
 (include "gst-extrafuncs.defs")
 (include "gst-types.defs")
 (include "libs.defs")
+(include "base.defs")
 
 ;; From ../gstreamer/gst/gst.h
 
@@ -1021,6 +1022,13 @@
   (caller-owns-return #t)
 )
 
+(define-method get_clock
+  (of-object "GstElement")
+  (c-name "gst_element_get_clock")
+  (return-type "GstClock*")
+  (caller-owns-return #t)
+)
+
 (define-method add_pad
   (of-object "GstElement")
   (c-name "gst_element_add_pad")

diff --git a/gst/gst.override b/gst/gst.override
index 38ea30e..139b02d 100644 (file)
--- a/gst/gst.override
+++ b/gst/gst.override
@@ -40,6 +40,12 @@ headers
 #include <gst/controller/gstcontroller.h>
 #include <gst/dataprotocol/dataprotocol.h>
 #include <gst/base/gstadapter.h>
+#include <gst/base/gstbasesrc.h>
+#include <gst/base/gstpushsrc.h>
+#include <gst/base/gstbasesink.h>
+#include <gst/base/gstbasetransform.h>
+#include <gst/base/gstcollectpads.h>
+#include <gst/base/gsttypefindhelper.h>
 
 #include <gst/net/gstnet.h>