gnomemm r1329 - in gstreamermm/trunk: . gstreamer gstreamer/gstreamermm gstreamer/gstreamermm/private gstreamer/src

[jaalburqu svn gnome org]

Author: jaalburqu
Date: Fri Feb  8 01:57:07 2008
New Revision: 1329
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1329&view=rev

Log:
2008-02-07  Josà Alburquerque  <jaalburqu svn gnome org>

	* gstreamer/gstreamermm.h: Added missing value.h and new childproxy.h
	* gstreamer/gstreamermm/gst_wrap_init.h:
	* gstreamer/gstreamermm/init.h:
	* gstreamer/gstreamermm/private/miniobject_p.h:
	* gstreamer/gstreamermm/private/object_p.h:
	* gstreamer/gstreamermm/wrap.cc:
	* gstreamer/gstreamermm/wrap.h:
	* gstreamer/gstreamermm/wrap_init.h: Reformatted license section of
	files; Removed license section in private files
	* gstreamer/src/Makefile_list_of_hg.am_fragment: Added childproxy
	* gstreamer/src/caps.hg: Made a couple of more method renames
	* gstreamer/src/childproxy.ccg:
	* gstreamer/src/childproxy.hg: Added childproxy source files


Added:
   gstreamermm/trunk/gstreamer/src/childproxy.ccg
   gstreamermm/trunk/gstreamer/src/childproxy.hg
Modified:
   gstreamermm/trunk/ChangeLog
   gstreamermm/trunk/gstreamer/gstreamermm.h
   gstreamermm/trunk/gstreamer/gstreamermm/gst_wrap_init.h
   gstreamermm/trunk/gstreamer/gstreamermm/init.h
   gstreamermm/trunk/gstreamer/gstreamermm/private/miniobject_p.h
   gstreamermm/trunk/gstreamer/gstreamermm/private/object_p.h
   gstreamermm/trunk/gstreamer/gstreamermm/wrap.cc
   gstreamermm/trunk/gstreamer/gstreamermm/wrap.h
   gstreamermm/trunk/gstreamer/gstreamermm/wrap_init.h
   gstreamermm/trunk/gstreamer/src/Makefile_list_of_hg.am_fragment
   gstreamermm/trunk/gstreamer/src/caps.hg

Modified: gstreamermm/trunk/gstreamer/gstreamermm.h
==============================================================================
--- gstreamermm/trunk/gstreamer/gstreamermm.h	(original)
+++ gstreamermm/trunk/gstreamer/gstreamermm.h	Fri Feb  8 01:57:07 2008
@@ -5,6 +5,7 @@
 #include <gstreamermm/buffer.h>
 #include <gstreamermm/bus.h>
 #include <gstreamermm/caps.h>
+#include <gstreamermm/childproxy.h>
 #include <gstreamermm/clock.h>
 #include <gstreamermm/element.h>
 #include <gstreamermm/enums.h>
@@ -20,6 +21,7 @@
 #include <gstreamermm/query.h>
 #include <gstreamermm/structure.h>
 #include <gstreamermm/systemclock.h>
+#include <gstreamermm/value.h>
 #include <gstreamermm/xml.h>
 
 #include <gstreamermm/init.h>

Modified: gstreamermm/trunk/gstreamer/gstreamermm/gst_wrap_init.h
==============================================================================
--- gstreamermm/trunk/gstreamer/gstreamermm/gst_wrap_init.h	(original)
+++ gstreamermm/trunk/gstreamer/gstreamermm/gst_wrap_init.h	Fri Feb  8 01:57:07 2008
@@ -1,4 +1,5 @@
 // -*- c++ -*-
+
 /* gstreamermm - a C++ wrapper for gstreamer
  *
  * Copyright 2008 The gstreamermm Development Team

Modified: gstreamermm/trunk/gstreamer/gstreamermm/init.h
==============================================================================
--- gstreamermm/trunk/gstreamer/gstreamermm/init.h	(original)
+++ gstreamermm/trunk/gstreamer/gstreamermm/init.h	Fri Feb  8 01:57:07 2008
@@ -1,4 +1,5 @@
 // -*- c++ -*-
+
 /* gstreamermm - a C++ wrapper for gstreamer
  *
  * Copyright 2008 The gstreamermm Development Team

Modified: gstreamermm/trunk/gstreamer/gstreamermm/private/miniobject_p.h
==============================================================================
--- gstreamermm/trunk/gstreamer/gstreamermm/private/miniobject_p.h	(original)
+++ gstreamermm/trunk/gstreamer/gstreamermm/private/miniobject_p.h	Fri Feb  8 01:57:07 2008
@@ -1,22 +1,3 @@
-/* gstreamermm - a C++ wrapper for gstreamer
- *
- * Copyright 2008 The gstreamermm Development Team
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
 #ifndef _GSTREAMERMM_MINIOBJECT_P_H
 #define _GSTREAMERMM_MINIOBJECT_P_H
 

Modified: gstreamermm/trunk/gstreamer/gstreamermm/private/object_p.h
==============================================================================
--- gstreamermm/trunk/gstreamer/gstreamermm/private/object_p.h	(original)
+++ gstreamermm/trunk/gstreamer/gstreamermm/private/object_p.h	Fri Feb  8 01:57:07 2008
@@ -1,28 +1,7 @@
-/* gstreamermm - a C++ wrapper for gstreamer
- *
- * Copyright 2008 The gstreamermm Development Team
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
 #ifndef _GSTREAMERMM_OBJECT_P_H
 #define _GSTREAMERMM_OBJECT_P_H
 
-
 #include <glibmm/private/object_p.h>
-
 #include <glibmm/class.h>
 
 namespace Gst

Modified: gstreamermm/trunk/gstreamer/gstreamermm/wrap.cc
==============================================================================
--- gstreamermm/trunk/gstreamer/gstreamermm/wrap.cc	(original)
+++ gstreamermm/trunk/gstreamer/gstreamermm/wrap.cc	Fri Feb  8 01:57:07 2008
@@ -1,5 +1,6 @@
 // -*- c++ -*-
 /* $Id: wrap.cc 447 2007-10-03 09:51:41Z murrayc $ */
+
 /* wrap.cc
  *
  * Copyright (C) 2008 The gstreamermm Development Team

Modified: gstreamermm/trunk/gstreamer/gstreamermm/wrap.h
==============================================================================
--- gstreamermm/trunk/gstreamer/gstreamermm/wrap.h	(original)
+++ gstreamermm/trunk/gstreamer/gstreamermm/wrap.h	Fri Feb  8 01:57:07 2008
@@ -1,4 +1,5 @@
 // -*- c++ -*-
+
 /* gstreamermm - a C++ wrapper for gstreamer
  *
  * Copyright 2008 The gstreamermm Development Team

Modified: gstreamermm/trunk/gstreamer/gstreamermm/wrap_init.h
==============================================================================
--- gstreamermm/trunk/gstreamer/gstreamermm/wrap_init.h	(original)
+++ gstreamermm/trunk/gstreamer/gstreamermm/wrap_init.h	Fri Feb  8 01:57:07 2008
@@ -1,4 +1,5 @@
 // -*- c++ -*-
+
 /* gstreamermm - a C++ wrapper for gstreamer
  *
  * Copyright 2008 The gstreamermm Development Team

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	Fri Feb  8 01:57:07 2008
@@ -4,10 +4,10 @@
 
 files_posix_hg =
 files_win32_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
+files_general_hg = bin.hg buffer.hg bus.hg caps.hg childproxy.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
 
 files_general_deprecated_hg =
 

Modified: gstreamermm/trunk/gstreamer/src/caps.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/caps.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/caps.hg	Fri Feb  8 01:57:07 2008
@@ -49,7 +49,7 @@
   _WRAP_METHOD(Structure* get_structure(guint idx), gst_caps_get_structure)
 
   _WRAP_METHOD(void remove_structure(guint idx), gst_caps_remove_structure)
-  _WRAP_METHOD(guint get_size() const, gst_caps_get_size)
+  _WRAP_METHOD(guint size() const, gst_caps_get_size)
 
   //TODO: Want to return RefPtr to Caps but using RefPtr in expressions such
   //TODO: as 'caps->set_simple(name1, value1)->set_simple(name2, value2)' a
@@ -67,9 +67,8 @@
   _WRAP_METHOD(bool equals_fixed(const Glib::RefPtr<Caps>& other_caps) const, gst_caps_is_equal_fixed)
   _WRAP_METHOD(bool always_compatible(const Glib::RefPtr<Caps>& other_caps) const, gst_caps_is_always_compatible)
   _WRAP_METHOD(bool subset(const Glib::RefPtr<Caps>& superset_caps) const, gst_caps_is_subset)
-  _WRAP_METHOD(Glib::RefPtr<Caps> intersect(const Glib::RefPtr<Caps>& other_caps) const, gst_caps_intersect)
-  //Not named union because it is a C++ keyword
-  _WRAP_METHOD(Glib::RefPtr<Caps> unions(const Glib::RefPtr<Caps>& other_caps) const, gst_caps_union)
+  _WRAP_METHOD(Glib::RefPtr<Caps> the_intersect(const Glib::RefPtr<Caps>& other_caps) const, gst_caps_intersect)
+  _WRAP_METHOD(Glib::RefPtr<Caps> the_union(const Glib::RefPtr<Caps>& other_caps) const, gst_caps_union)
   _WRAP_METHOD(Glib::RefPtr<Caps> normalize(), gst_caps_normalize)
   _WRAP_METHOD(bool simplify(), gst_caps_do_simplify)
   _WRAP_METHOD(xmlNodePtr save(const xmlNodePtr& parent), gst_caps_save_thyself)

Added: gstreamermm/trunk/gstreamer/src/childproxy.ccg
==============================================================================
--- (empty file)
+++ gstreamermm/trunk/gstreamer/src/childproxy.ccg	Fri Feb  8 01:57:07 2008
@@ -0,0 +1,21 @@
+// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+
+/* gstreamermm - a C++ wrapper for gstreamer
+ *
+ * Copyright 2008 The gstreamermm Development Team
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+

Added: gstreamermm/trunk/gstreamer/src/childproxy.hg
==============================================================================
--- (empty file)
+++ gstreamermm/trunk/gstreamer/src/childproxy.hg	Fri Feb  8 01:57:07 2008
@@ -0,0 +1,54 @@
+// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+
+/* gstreamermm - a C++ wrapper for gstreamer
+ *
+ * Copyright 2008 The gstreamermm Development Team
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <gst/gstchildproxy.h>
+#include <glibmm/interface.h>
+#include <gstreamermm/object.h>
+
+_DEFS(gstreamermm,gst)
+_PINCLUDE(glibmm/private/interface_p.h)
+_PINCLUDE(gstreamermm/private/object_p.h)
+
+namespace Gst
+{
+
+/** ChildProxy â Interface for multi child elements.
+ * This interface abstracts handling of property sets for child elements.
+ * Imagine elements such as mixers or polyphonic generators. They all have
+ * multiple Pad or some kind of voice objects. The element acts as a parent
+ * for those child objects. Each child has the same properties.
+ *
+ * By implementing this interface the child properties can be accessed from
+ * the parent element by using child_proxy_get() and child_proxy_set().
+ *
+ * Property names are written as "child-name::property-name". The whole naming
+ * scheme is recursive. Thus "child1::child2::property" is valid too, if
+ * "child1" also implements the ChildProxy interface.
+ *
+ * @newin2p16
+ */
+class ChildProxy : public Glib::Interface
+{
+  _CLASS_INTERFACE(ChildProxy, GstChildProxy, GST_CHILD_PROXY, GstChildProxyInterface)
+};
+
+} // namespace Gst
+