gnomemm r1320 - in gstreamermm/trunk: . gstreamer gstreamer/src tools/m4

[murrayc svn gnome org]

Author: murrayc
Date: Tue Feb  5 21:17:44 2008
New Revision: 1320
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1320&view=rev

Log:
2008-02-05  Siavash Safi  <siavash safi gmail com>

* gstreamer/gstreamermm.h: Added buffer.h
* gstreamer/src/Makefile_list_of_hg.am_fragment: Added buffer.hg
* gstreamer/src/buffer.ccg:
* gstreamer/src/buffer.hg:
* gstreamer/src/enums.hg: Added BufferFlag, BufferCopyFlags,
MiniObjectFlags
* gstreamer/src/event.hg: Corrected the comment on wrap()
* gstreamer/src/gst_enums.defs: Changed BufferFlag defenition manually
* gstreamer/src/gst_others.defs: Added methods for Buffer:
copy(), copy_metadata(), flags(), flag_is_set(), flag_set(),
flag_unset()
* tools/m4/convert_gst.m4: Added conversions:
Glib::RefPtr<Buffer>',
GstBuffer*',
const GstBuffer*',
GstBuffer*',
Glib::RefPtr<Caps const>',
BufferFlag,
BufferCopyFlags,
Replaced all _CONVERSION()s for enums by _CONV_ENUM()


Modified:
   gstreamermm/trunk/ChangeLog
   gstreamermm/trunk/gstreamer/gstreamermm.h
   gstreamermm/trunk/gstreamer/src/Makefile_list_of_hg.am_fragment
   gstreamermm/trunk/gstreamer/src/enums.hg
   gstreamermm/trunk/gstreamer/src/event.hg
   gstreamermm/trunk/gstreamer/src/gst_enums.defs
   gstreamermm/trunk/gstreamer/src/gst_others.defs
   gstreamermm/trunk/tools/m4/convert_gst.m4

Modified: gstreamermm/trunk/gstreamer/gstreamermm.h
==============================================================================
--- gstreamermm/trunk/gstreamer/gstreamermm.h	(original)
+++ gstreamermm/trunk/gstreamer/gstreamermm.h	Tue Feb  5 21:17:44 2008
@@ -2,6 +2,7 @@
 #define _GSTREAMERMM_H_
 
 #include <gstreamermm/bin.h>
+#include <gstreamermm/buffer.h>
 #include <gstreamermm/bus.h>
 #include <gstreamermm/caps.h>
 #include <gstreamermm/clock.h>

Modified: gstreamermm/trunk/gstreamer/src/Makefile_list_of_hg.am_fragment
==============================================================================
--- gstreamermm/trunk/gstreamer/src/Makefile_list_of_hg.am_fragment	(original)
+++ gstreamermm/trunk/gstreamer/src/Makefile_list_of_hg.am_fragment	Tue Feb  5 21:17:44 2008
@@ -4,7 +4,7 @@
 
 files_posix_hg =
 files_win32_hg =
-files_general_hg = bin.hg bus.hg caps.hg clock.hg element.hg enums.hg \
+files_general_hg = bin.hg buffer.hg bus.hg caps.hg clock.hg element.hg enums.hg \
         error.hg event.hg format.hg iterator.hg message.hg pad.hg \
         padtemplate.hg pipeline.hg query.hg structure.hg systemclock.hg \
         value.hg xml.hg

Modified: gstreamermm/trunk/gstreamer/src/enums.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/enums.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/enums.hg	Tue Feb  5 21:17:44 2008
@@ -4,7 +4,8 @@
 
 namespace Gst
 {
-
+_WRAP_ENUM(BufferCopyFlags, GstBufferCopyFlags)
+_WRAP_ENUM(BufferFlag, GstBufferFlag)
 _WRAP_ENUM(BusSyncReply, GstBusSyncReply)
 _WRAP_ENUM(ClockEntryType, GstClockEntryType)
 _WRAP_ENUM(ClockReturn, GstClockReturn)
@@ -37,6 +38,7 @@
 _WRAP_ENUM(IteratorItem, GstIteratorItem)
 _WRAP_ENUM(IteratorResult, GstIteratorResult)
 _WRAP_ENUM(MessageType, GstMessageType)
+_WRAP_ENUM(MiniObjectFlags, GstMiniObjectFlags)
 _WRAP_ENUM(PadDirection, GstPadDirection)
 _WRAP_ENUM(PadLinkReturn, GstPadLinkReturn)
 _WRAP_ENUM(PadPresence, GstPadPresence)

Modified: gstreamermm/trunk/gstreamer/src/event.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/event.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/event.hg	Tue Feb  5 21:17:44 2008
@@ -21,7 +21,7 @@
   _MEMBER_GET(source, src, Glib::RefPtr<Gst::Object>, GstObject)
 
   /** Wrap a GstEvent* in a C++ instance, creating an instance of a derived
-   * Gst::Event. Gst::wrap() would just create a Gst::Message (rather than a
+   * Gst::Event. Gst::wrap() would just create a Gst::Event (rather than a
    * derived one) because the derived Gst::Event classes do not correspond
    * to GType types in the GStreamer API.
    */

Modified: gstreamermm/trunk/gstreamer/src/gst_enums.defs
==============================================================================
--- gstreamermm/trunk/gstreamer/src/gst_enums.defs	(original)
+++ gstreamermm/trunk/gstreamer/src/gst_enums.defs	Tue Feb  5 21:17:44 2008
@@ -1,3 +1,9 @@
+;; Note: several defenitions are changed manually, please redo the changes
+;; every time you regenerate this file.
+;; Here is the list of the defenitions:
+;; BufferFlag
+;; MessageType
+
 ;; From /opt/usr-jhbuild/include/gstreamer-0.10/gst/gstbin.h
 
 (define-enum-extended BinFlags
@@ -13,7 +19,13 @@
   (in-module "Gst")
   (c-name "GstBufferFlag")
   (values
-    '("y" "GST_BUFFER_FLAG_READONLY" "#error")
+    '("readonly" "GST_BUFFER_FLAG_READONLY" "GST_MINI_OBJECT_FLAG_READONLY")
+    '("preroll" "GST_BUFFER_FLAG_PREROLL" "GST_MINI_OBJECT_FLAG_READONLY << 0")
+    '("discont" "GST_BUFFER_FLAG_DISCONT" "GST_MINI_OBJECT_FLAG_READONLY << 1")
+    '("in-caps" "GST_BUFFER_FLAG_IN_CAPS" "GST_MINI_OBJECT_FLAG_READONLY << 2")
+    '("gap" "GST_BUFFER_FLAG_GAP" "GST_MINI_OBJECT_FLAG_READONLY << 3")
+    '("delta-unit" "GST_BUFFER_FLAG_DELTA_UNIT" "GST_MINI_OBJECT_FLAG_READONLY << 4")
+    '("last" "GST_BUFFER_FLAG_LAST" "GST_MINI_OBJECT_FLAG_READONLY << 8")
   )
 )
 

Modified: gstreamermm/trunk/gstreamer/src/gst_others.defs
==============================================================================
--- gstreamermm/trunk/gstreamer/src/gst_others.defs	(original)
+++ gstreamermm/trunk/gstreamer/src/gst_others.defs	Tue Feb  5 21:17:44 2008
@@ -0,0 +1,49 @@
+(define-method copy
+  (of-object "GstBuffer")
+  (c-name "gst_buffer_copy")
+  (return-type "GstBuffer*")
+)
+
+(define-method copy_metadata
+  (of-object "GstBuffer")
+  (c-name "gst_buffer_copy_metadata")
+  (return-type "void")
+  (parameters
+    '("const-GstBuffer*" "source_buffer")
+    '("GstBufferCopyFlags" "flags")
+  )
+)
+
+(define-method flags
+  (of-object "GstBuffer")
+  (c-name "GST_BUFFER_FLAGS")
+  (return-type "guint")
+)
+
+(define-method flag_is_set
+  (of-object "GstBuffer")
+  (c-name "GST_BUFFER_FLAG_IS_SET")
+  (return-type "gboolean")
+  (parameters
+    '("GstBufferFlag" "flag")
+  )
+)
+
+(define-method flag_set
+  (of-object "GstBuffer")
+  (c-name "GST_BUFFER_FLAG_SET")
+  (return-type "void")
+  (parameters
+    '("GstBufferFlag" "flag")
+  )
+)
+
+(define-method flag_unset
+  (of-object "GstBuffer")
+  (c-name "GST_BUFFER_FLAG_UNSET")
+  (return-type "void")
+  (parameters
+    '("GstBufferFlag" "flag")
+  )
+)
+

Modified: gstreamermm/trunk/tools/m4/convert_gst.m4
==============================================================================
--- gstreamermm/trunk/tools/m4/convert_gst.m4	(original)
+++ gstreamermm/trunk/tools/m4/convert_gst.m4	Tue Feb  5 21:17:44 2008
@@ -40,6 +40,11 @@
 _CONVERSION(`const Glib::RefPtr<Query>&',`GstQuery*',__CONVERT_REFPTR_TO_P)
 _CONVERSION(`const Glib::RefPtr<Caps>&',`GstCaps*',__CONVERT_REFPTR_TO_P)
 _CONVERSION(`const Glib::RefPtr<Bus>&',`GstBus*',__CONVERT_REFPTR_TO_P)
+_CONVERSION(`GstBuffer*',`Glib::RefPtr<Buffer>',`wrap($3)')
+_CONVERSION(`const Glib::RefPtr<Buffer>&',`GstBuffer*',__CONVERT_REFPTR_TO_P)
+_CONVERSION(`const Glib::RefPtr<Buffer>&',`const GstBuffer*',__CONVERT_REFPTR_TO_P)
+_CONVERSION(`Glib::RefPtr<Buffer>',`GstBuffer*',__CONVERT_REFPTR_TO_P)
+_CONVERSION(`GstCaps*',`Glib::RefPtr<Caps const>',`wrap($3)')
 
 _CONVERSION(`Structure&',`GstStructure*',`((GstStructure*)(&($3)))')
 _CONVERSION(`GstStructure*',`Structure*',`((Structure*) ($3))')
@@ -49,30 +54,28 @@
 _CONVERSION(`GstBus*',`Glib::RefPtr<Bus>',`Glib::wrap($3)')
 
 _CONVERSION(`Format&',`GstFormat*',`(($2) &($3))')
-_CONVERSION(`SeekFlags',`GstSeekFlags',`(GstSeekFlags($3))')
 _CONVERSION(`const gint64&',`gint64',`$3')
 _CONVERSION(`gint64&',`gint64*',`&($3)')
 _CONVERSION(`const double&',`gdouble',`$3')
-
-_CONVERSION(`StateChange',`GstStateChange',`GstStateChange($3)')
-_CONVERSION(`GstStateChange',`StateChange',`StateChange($3)')
-
-_CONVERSION(`GstMessageType',`MessageType',`MessageType($3)')
-_CONVERSION(`MessageType',`GstMessageType',`GstMessageType($3)')
-_CONVERSION(`GstEventType',`EventType',`EventType($3)')
-_CONVERSION(`EventType',`GstEventType',`GstEventType($3)')
-_CONVERSION(`GstQueryType',`QueryType',`QueryType($3)')
-_CONVERSION(`QueryType',`GstQueryType',`GstQueryType($3)')
+_CONVERSION(`const guint&',`guint',`$3')
+_CONVERSION(`const guint32&',`guint32',`$3')
 
 _CONVERSION(`GQuark',`Glib::QueryQuark',`Glib::QueryQuark($3)')
 _CONVERSION(`const Glib::QueryQuark&',`GQuark',`$3')
 
-_CONV_ENUM(Gst,State)
-_CONV_ENUM(Gst,StateChangeReturn)
-_CONV_ENUM(Gst,PadLinkReturn)
-_CONV_ENUM(Gst,PadDirection)
-_CONV_ENUM(Gst,PadPresence)
+_CONV_ENUM(Gst,BufferCopyFlags)
+_CONV_ENUM(Gst,BufferFlag)
 _CONV_ENUM(Gst,ClockEntryType)
 _CONV_ENUM(Gst,ClockReturn)
+_CONV_ENUM(Gst,EventType)
 _CONV_ENUM(Gst,Format)
+_CONV_ENUM(Gst,MessageType)
+_CONV_ENUM(Gst,PadDirection)
+_CONV_ENUM(Gst,PadLinkReturn)
+_CONV_ENUM(Gst,PadPresence)
+_CONV_ENUM(Gst,QueryType)
+_CONV_ENUM(Gst,SeekFlags)
 _CONV_ENUM(Gst,SeekType)
+_CONV_ENUM(Gst,State)
+_CONV_ENUM(Gst,StateChange)
+_CONV_ENUM(Gst,StateChangeReturn)