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

[murrayc svn gnome org]

Author: murrayc
Date: Sun Feb 10 15:47:05 2008
New Revision: 1334
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1334&view=rev

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

* gstreamer/gstreamermm.h: Added index.h
* gstreamer/src/Makefile_list_of_hg.am_fragment: Added index.hg
* gstreamer/src/enums.hg: Added AssocFlags, IndexCertainty,
IndexEntryType, IndexFlags, IndexLookupMethod, IndexResolverMethod
* gstreamer/src/gst_enums.defs: Added GstIndexFlags values manually
* gstreamer/src/gst_others.defs: Added defenitions for
GST_INDEX_IS_READABLE, GST_INDEX_IS_WRITABLE
* gstreamer/src/index.ccg:
* gstreamer/src/index.hg:
* tools/m4/convert_gst.m4: Added Conversions:
GstIndexEntry* to IndexEntry
const IndexAssociation& to const GstIndexAssociation*
AssocFlags
IndexCertainty
IndexEntryType
IndexFlags
IndexLookupMethod
IndexResolverMethod

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/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	Sun Feb 10 15:47:05 2008
@@ -13,6 +13,7 @@
 #include <gstreamermm/error.h>
 #include <gstreamermm/event.h>
 #include <gstreamermm/format.h>
+#include <gstreamermm/index.h>
 #include <gstreamermm/iterator.h>
 #include <gstreamermm/message.h>
 #include <gstreamermm/object.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	Sun Feb 10 15:47:05 2008
@@ -6,9 +6,9 @@
 files_win32_hg =
 files_general_hg = bin.hg buffer.hg bus.hg caps.hg childproxy.hg clock.hg \
 	element.hg elementfactory.hg enums.hg error.hg event.hg format.hg \
-	iterator.hg message.hg pad.hg padtemplate.hg pipeline.hg plugin.hg \
-	pluginfeature.hg query.hg structure.hg systemclock.hg value.hg \
-	xml.hg
+	index.hg iterator.hg message.hg pad.hg padtemplate.hg pipeline.hg \
+	plugin.hg pluginfeature.hg query.hg structure.hg systemclock.hg \
+	value.hg xml.hg
 
 files_general_deprecated_hg =
 

Modified: gstreamermm/trunk/gstreamer/src/enums.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/enums.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/enums.hg	Sun Feb 10 15:47:05 2008
@@ -25,6 +25,7 @@
 
 namespace Gst
 {
+_WRAP_ENUM(AssocFlags, GstAssocFlags)
 _WRAP_ENUM(BufferCopyFlags, GstBufferCopyFlags)
 _WRAP_ENUM(BufferFlag, GstBufferFlag)
 _WRAP_ENUM(BusSyncReply, GstBusSyncReply)
@@ -56,6 +57,11 @@
 };
 
 _WRAP_ENUM(Format, GstFormat)
+_WRAP_ENUM(IndexCertainty, GstIndexCertainty)
+_WRAP_ENUM(IndexEntryType, GstIndexEntryType)
+_WRAP_ENUM(IndexFlags, GstIndexFlags)
+_WRAP_ENUM(IndexLookupMethod, GstIndexLookupMethod)
+_WRAP_ENUM(IndexResolverMethod, GstIndexResolverMethod)
 _WRAP_ENUM(IteratorItem, GstIteratorItem)
 _WRAP_ENUM(IteratorResult, GstIteratorResult)
 _WRAP_ENUM(MessageType, GstMessageType)

Modified: gstreamermm/trunk/gstreamer/src/gst_enums.defs
==============================================================================
--- gstreamermm/trunk/gstreamer/src/gst_enums.defs	(original)
+++ gstreamermm/trunk/gstreamer/src/gst_enums.defs	Sun Feb 10 15:47:05 2008
@@ -2,6 +2,7 @@
 ;; every time you regenerate this file.
 ;; Here is the list of the defenitions:
 ;; BufferFlag
+;; IndexFlags
 ;; MessageType
 
 ;; From /opt/usr-jhbuild/include/gstreamer-0.10/gst/gstbin.h
@@ -339,6 +340,9 @@
   (in-module "Gst")
   (c-name "GstIndexFlags")
   (values
+    '("writable" "GST_INDEX_WRITABLE" "GST_OBJECT_FLAG_LAST << 0")
+    '("readable" "GST_INDEX_READABLE" "GST_OBJECT_FLAG_LAST << 1")
+    '("last" "GST_INDEX_FLAG_LAST" "GST_OBJECT_FLAG_LAST << 8")
   )
 )
 

Modified: gstreamermm/trunk/gstreamer/src/gst_others.defs
==============================================================================
--- gstreamermm/trunk/gstreamer/src/gst_others.defs	(original)
+++ gstreamermm/trunk/gstreamer/src/gst_others.defs	Sun Feb 10 15:47:05 2008
@@ -47,3 +47,14 @@
   )
 )
 
+(define-method is_readable
+  (of-object "GstIndex")
+  (c-name "GST_INDEX_IS_READABLE")
+  (return-type "gboolean")
+)
+
+(define-method is_writable
+  (of-object "GstIndex")
+  (c-name "GST_INDEX_IS_WRITABLE")
+  (return-type "gboolean")
+)

Modified: gstreamermm/trunk/tools/m4/convert_gst.m4
==============================================================================
--- gstreamermm/trunk/tools/m4/convert_gst.m4	(original)
+++ gstreamermm/trunk/tools/m4/convert_gst.m4	Sun Feb 10 15:47:05 2008
@@ -47,6 +47,8 @@
 _CONVERSION(`const Glib::RefPtr<Buffer>&',`GstBuffer*', `Glib::unwrap($3)')
 _CONVERSION(`const Glib::RefPtr<Buffer>&',`const GstBuffer*', `Glib::unwrap($3)')
 _CONVERSION(`Glib::RefPtr<Buffer>',`GstBuffer*', `Glib::unwrap($3)')
+_CONVERSION(`GstIndexEntry*',`IndexEntry',`Glib::wrap($3)')
+_CONVERSION(`const IndexAssociation&',`const GstIndexAssociation*',`((GstIndexAssociation*)(&($3)))')
 
 _CONVERSION(`Structure&',`GstStructure*',`((GstStructure*)(&($3)))')
 _CONVERSION(`GstStructure*',`Structure*',`((Structure*) ($3))')
@@ -65,12 +67,18 @@
 _CONVERSION(`GQuark',`Glib::QueryQuark',`Glib::QueryQuark($3)')
 _CONVERSION(`const Glib::QueryQuark&',`GQuark',`$3')
 
+_CONV_ENUM(Gst,AssocFlags)
 _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,IndexCertainty)
+_CONV_ENUM(Gst,IndexEntryType)
+_CONV_ENUM(Gst,IndexFlags)
+_CONV_ENUM(Gst,IndexLookupMethod)
+_CONV_ENUM(Gst,IndexResolverMethod)
 _CONV_ENUM(Gst,MessageType)
 _CONV_ENUM(Gst,PadDirection)
 _CONV_ENUM(Gst,PadLinkReturn)