GNOME.org
 

gnomemm r1561 - in gstreamermm/trunk: . gstreamer/src gstreamerbase gstreamerbase/gstreamerbasemm gstreamerbase/src tools/extra_defs_gen tools/m4

Author: jaalburqu
Date: Thu Jun 12 22:36:02 2008
New Revision: 1561
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1561&view=rev

Log:
2008-06-12  Josà Alburquerque  <jaalburqu svn gnome org>

	* gstreamerbase/gstreamerbasemm.h:
	* gstreamerbase/src/colorbalance.ccg:
	* gstreamerbase/src/colorbalance.hg:
	* gstreamerbase/src/colorbalancechannel.ccg:
	* gstreamerbase/src/colorbalancechannel.hg:
	* gstreamerbase/src/Makefile_list_of_hg.am_fragment: Added
	ColorBalance and ColorBalanceChannel.

	* tools/extra_defs_gen/Makefile.am:
	* tools/extra_defs_gen/generate_defs_gstbase.cc:
	* gstreamerbase/src/gstbase_signals.defs: Fixed extra defs generation
	tool compilation for gstreamerbasemm; included GST_TYPE_COLOR_BALANCE,
	GST_TYPE_COLOR_BALANCE_CHANNEL and GST_TYPE_X_OVERLAY, and regenerated
	signal defs.

	* tools/m4/Makefile_list_of_sources.am_fragment:
	* tools/m4/convert.m4:
	* tools/m4/convert_gstbase.m4: Added conversion m4 file for
	gstreamerbasemm.
	* tools/m4/convert_gst.m4: Moved _CONV_ENUMs to top and removed unused
	_CONV_GST_ENUM macro.

	* gstreamerbase/gstreamerbasemm/gst_wrap_init.h:
	* gstreamerbase/gstreamerbasemm/init.h:
	* gstreamerbase/gstreamerbasemm/wrap_init.h: Added docs.

	* gstreamer/src/pipeline.hg: Removed duplicate PINCLUDE's (already in
	*.ccg file).

Added:
   gstreamermm/trunk/gstreamerbase/src/colorbalance.ccg
   gstreamermm/trunk/gstreamerbase/src/colorbalance.hg
   gstreamermm/trunk/gstreamerbase/src/colorbalancechannel.ccg
   gstreamermm/trunk/gstreamerbase/src/colorbalancechannel.hg
   gstreamermm/trunk/tools/m4/convert_gstbase.m4
Modified:
   gstreamermm/trunk/ChangeLog
   gstreamermm/trunk/gstreamer/src/pipeline.hg
   gstreamermm/trunk/gstreamerbase/gstreamerbasemm.h
   gstreamermm/trunk/gstreamerbase/gstreamerbasemm/gst_wrap_init.h
   gstreamermm/trunk/gstreamerbase/gstreamerbasemm/init.h
   gstreamermm/trunk/gstreamerbase/gstreamerbasemm/wrap_init.h
   gstreamermm/trunk/gstreamerbase/src/Makefile_list_of_hg.am_fragment
   gstreamermm/trunk/gstreamerbase/src/gstbase_signals.defs
   gstreamermm/trunk/tools/extra_defs_gen/Makefile.am
   gstreamermm/trunk/tools/extra_defs_gen/generate_defs_gstbase.cc
   gstreamermm/trunk/tools/m4/Makefile_list_of_sources.am_fragment
   gstreamermm/trunk/tools/m4/convert.m4
   gstreamermm/trunk/tools/m4/convert_gst.m4

Modified: gstreamermm/trunk/gstreamer/src/pipeline.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/pipeline.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/pipeline.hg	Thu Jun 12 22:36:02 2008
@@ -23,9 +23,6 @@
 #include <gstreamermm/clock.h>
 
 _DEFS(gstreamermm,gst)
-_PINCLUDE(glibmm/private/object_p.h)
-_PINCLUDE(gstreamermm/private/bin_p.h)
-
 
 namespace Gst
 {

Modified: gstreamermm/trunk/gstreamerbase/gstreamerbasemm.h
==============================================================================
--- gstreamermm/trunk/gstreamerbase/gstreamerbasemm.h	(original)
+++ gstreamermm/trunk/gstreamerbase/gstreamerbasemm.h	Thu Jun 12 22:36:02 2008
@@ -5,6 +5,8 @@
 
 #include <gstreamerbasemm/init.h>
 #include <gstreamerbasemm/wrap_init.h>
+#include <gstreamerbasemm/colorbalance.h>
+#include <gstreamerbasemm/colorbalancechannel.h>
 #include <gstreamerbasemm/xoverlay.h>
 
 #endif // _GSTREAMERBASEMM_H

Modified: gstreamermm/trunk/gstreamerbase/gstreamerbasemm/gst_wrap_init.h
==============================================================================
--- gstreamermm/trunk/gstreamerbase/gstreamerbasemm/gst_wrap_init.h	(original)
+++ gstreamermm/trunk/gstreamerbase/gstreamerbasemm/gst_wrap_init.h	Thu Jun 12 22:36:02 2008
@@ -26,6 +26,10 @@
 
 namespace GstBase
 {
+  /** Initializes wrapping system of Gst::MiniObject derrived classes.
+   * There is no need to use this function directly; instead use Gst::init() or
+   * Gst::init_check(). 
+   */
   void gst_wrap_init();
 }
 

Modified: gstreamermm/trunk/gstreamerbase/gstreamerbasemm/init.h
==============================================================================
--- gstreamermm/trunk/gstreamerbase/gstreamerbasemm/init.h	(original)
+++ gstreamermm/trunk/gstreamerbase/gstreamerbasemm/init.h	Thu Jun 12 22:36:02 2008
@@ -25,7 +25,7 @@
 namespace GstBase
 {
 
-/** Initialize gstreamerbasemm
+/** Initialize gstreamerbasemm.
  */
 void init();
   

Modified: gstreamermm/trunk/gstreamerbase/gstreamerbasemm/wrap_init.h
==============================================================================
--- gstreamermm/trunk/gstreamerbase/gstreamerbasemm/wrap_init.h	(original)
+++ gstreamermm/trunk/gstreamerbase/gstreamerbasemm/wrap_init.h	Thu Jun 12 22:36:02 2008
@@ -26,6 +26,10 @@
 
 namespace GstBase
 {
+  /** Initializes the main gstreamerbasemm wrapping system.
+   * There's no need to use this function directly; instead use Gst::init() or
+   * Gst::init_check(). 
+   */
   void wrap_init();
 }
 

Modified: gstreamermm/trunk/gstreamerbase/src/Makefile_list_of_hg.am_fragment
==============================================================================
--- gstreamermm/trunk/gstreamerbase/src/Makefile_list_of_hg.am_fragment	(original)
+++ gstreamermm/trunk/gstreamerbase/src/Makefile_list_of_hg.am_fragment	Thu Jun 12 22:36:02 2008
@@ -4,7 +4,7 @@
 
 files_posix_hg =
 files_win32_hg =
-files_general_hg = xoverlay.hg
+files_general_hg = colorbalance.hg colorbalancechannel.hg xoverlay.hg
 
 files_general_deprecated_hg =
 

Added: gstreamermm/trunk/gstreamerbase/src/colorbalance.ccg
==============================================================================
--- (empty file)
+++ gstreamermm/trunk/gstreamerbase/src/colorbalance.ccg	Thu Jun 12 22:36:02 2008
@@ -0,0 +1,22 @@
+// -*- 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 <gstreamerbasemm/colorbalancechannel.h>

Added: gstreamermm/trunk/gstreamerbase/src/colorbalance.hg
==============================================================================
--- (empty file)
+++ gstreamermm/trunk/gstreamerbase/src/colorbalance.hg	Thu Jun 12 22:36:02 2008
@@ -0,0 +1,51 @@
+// -*- 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/interfaces/colorbalance.h>
+#include <glibmm/interface.h>
+
+_DEFS(gstreamerbasemm,gstbase)
+
+namespace GstBase
+{
+
+_WRAP_ENUM(ColorBalanceType, GstColorBalanceType)
+
+class ColorBalanceChannel;
+
+/** GstBase::ColorBalance â Interface for adjusting color balance settings.
+ */
+class ColorBalance : public Glib::Interface
+{
+  _CLASS_INTERFACE(ColorBalance, GstColorBalance, GST_COLOR_BALANCE, GstColorBalanceClass)
+
+public:
+#m4 _CONVERSION(`const GList*', `Glib::ListHandle< Glib::RefPtr<ColorBalanceChannel> >', `$2(const_cast<GList*>($3), Glib::OWNERSHIP_NONE)')
+  _WRAP_METHOD(Glib::ListHandle< Glib::RefPtr<ColorBalanceChannel> > list_channels(), gst_color_balance_list_channels)
+
+_WRAP_METHOD(int get_value(const Glib::RefPtr<ColorBalanceChannel>& channel), gst_color_balance_get_value)
+_WRAP_METHOD(void set_value(const Glib::RefPtr<ColorBalanceChannel>& channel, int value), gst_color_balance_set_value)
+_WRAP_METHOD(void value_changed(const Glib::RefPtr<ColorBalanceChannel>& channel, int value), gst_color_balance_value_changed)
+};
+
+
+} // namespace GstBase
+

Added: gstreamermm/trunk/gstreamerbase/src/colorbalancechannel.ccg
==============================================================================
--- (empty file)
+++ gstreamermm/trunk/gstreamerbase/src/colorbalancechannel.ccg	Thu Jun 12 22:36:02 2008
@@ -0,0 +1,23 @@
+// -*- 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.
+ */
+
+_PINCLUDE(glibmm/private/object_p.h)
+

Added: gstreamermm/trunk/gstreamerbase/src/colorbalancechannel.hg
==============================================================================
--- (empty file)
+++ gstreamermm/trunk/gstreamerbase/src/colorbalancechannel.hg	Thu Jun 12 22:36:02 2008
@@ -0,0 +1,44 @@
+// -*- 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/interfaces/colorbalancechannel.h>
+#include <glibmm/object.h>
+
+_DEFS(gstreamerbasemm,gstbase)
+
+namespace GstBase
+{
+
+/** GstBase::ColorBalanceChannel â Represents a color balance channel.
+ */
+class ColorBalanceChannel : public Glib::Object
+{
+  _CLASS_GOBJECT(ColorBalanceChannel, GstColorBalanceChannel, GST_COLOR_BALANCE_CHANNEL, Glib::Object, GObject)
+
+public:
+  /** Signals that the channel has changed.
+   * @param value The new value of the channel.
+   */
+  _WRAP_SIGNAL(void value_changed(int value), "value-changed")
+};
+
+} // namespace GstBase
+

Modified: gstreamermm/trunk/gstreamerbase/src/gstbase_signals.defs
==============================================================================
--- gstreamermm/trunk/gstreamerbase/src/gstbase_signals.defs	(original)
+++ gstreamermm/trunk/gstreamerbase/src/gstbase_signals.defs	Thu Jun 12 22:36:02 2008
@@ -0,0 +1,15 @@
+;; From GstColorBalance
+
+;; From GstColorBalanceChannel
+
+(define-signal value-changed
+  (of-object "GstColorBalanceChannel")
+  (return-type "void")
+  (when "last")
+  (parameters
+    '("gint" "p0")
+  )
+)
+
+;; From GstXOverlay
+

Modified: gstreamermm/trunk/tools/extra_defs_gen/Makefile.am
==============================================================================
--- gstreamermm/trunk/tools/extra_defs_gen/Makefile.am	(original)
+++ gstreamermm/trunk/tools/extra_defs_gen/Makefile.am	Thu Jun 12 22:36:02 2008
@@ -1,8 +1,8 @@
 # Build the generate_properties_defs utility executable.
 # This is not used to build the rest of gtkmm.
 
-INCLUDES = $(GSTREAMERMM_CFLAGS)
-LIBS = $(GSTREAMERMM_LIBS) -lglibmm_generate_extra_defs-2.4
+INCLUDES = $(GSTREAMERMM_CFLAGS) $(GSTREAMERBASEMM_CFLAGS)
+LIBS = $(GSTREAMERMM_LIBS) $(GSTREAMERBASEMM_LIBS) -lglibmm_generate_extra_defs-2.4
 
 noinst_PROGRAMS = generate_extra_defs generate_defs_gstbase
 generate_extra_defs_SOURCES = generate_defs_gst.cc

Modified: gstreamermm/trunk/tools/extra_defs_gen/generate_defs_gstbase.cc
==============================================================================
--- gstreamermm/trunk/tools/extra_defs_gen/generate_defs_gstbase.cc	(original)
+++ gstreamermm/trunk/tools/extra_defs_gen/generate_defs_gstbase.cc	Thu Jun 12 22:36:02 2008
@@ -21,13 +21,16 @@
 
 #include <glib.h>
 #include <gst/gst.h>
+#include <gst/interfaces/colorbalance.h>
+#include <gst/interfaces/colorbalancechannel.h>
+#include <gst/interfaces/xoverlay.h>
 
 int main (int argc, char *argv[])
 {
   gst_init (&argc, &argv);
-  /*std::cout << get_defs(GST_TYPE_BUS)
-            << get_defs(GST_TYPE_BIN)
-            << get_defs(GST_TYPE_BUFFER);*/
+  std::cout << get_defs(GST_TYPE_COLOR_BALANCE)
+            << get_defs(GST_TYPE_COLOR_BALANCE_CHANNEL)
+            << get_defs(GST_TYPE_X_OVERLAY);
 
   return 0;
 }

Modified: gstreamermm/trunk/tools/m4/Makefile_list_of_sources.am_fragment
==============================================================================
--- gstreamermm/trunk/tools/m4/Makefile_list_of_sources.am_fragment	(original)
+++ gstreamermm/trunk/tools/m4/Makefile_list_of_sources.am_fragment	Thu Jun 12 22:36:02 2008
@@ -1,2 +1,2 @@
-files_tools_m4 = convert.m4 convert_gst.m4 class_gstminiobject.m4 class_boxedtype_extra.m4
+files_tools_m4 = convert.m4 convert_gst.m4 convert_gstbase.m4 class_gstminiobject.m4 class_boxedtype_extra.m4
 

Modified: gstreamermm/trunk/tools/m4/convert.m4
==============================================================================
--- gstreamermm/trunk/tools/m4/convert.m4	(original)
+++ gstreamermm/trunk/tools/m4/convert.m4	Thu Jun 12 22:36:02 2008
@@ -1,5 +1,6 @@
 include(convert_base.m4)
 include(convert_glib.m4)
 include(convert_gst.m4)
+include(convert_gstbase.m4)
 include(class_gstminiobject.m4)
 include(class_boxedtype_extra.m4)

Modified: gstreamermm/trunk/tools/m4/convert_gst.m4
==============================================================================
--- gstreamermm/trunk/tools/m4/convert_gst.m4	(original)
+++ gstreamermm/trunk/tools/m4/convert_gst.m4	Thu Jun 12 22:36:02 2008
@@ -1,12 +1,31 @@
-dnl 
-dnl Glib C names have prefix 'G' but C++ namespace Glib
-dnl 
-define(`_CONV_GST_ENUM',`dnl
-_CONVERSION(`GST$1', `$1', (($1)(__ARG3__)))
-_CONVERSION(`GST$1', `$1', ((Glib::$1)(__ARG3__)))
-_CONVERSION(`$1', `GST$1', ((GST$1)(__ARG3__)))
-_CONVERSION(`$1', `GST$1', ((GST$1)(__ARG3__)))
-')dnl
+#Enums
+_CONV_ENUM(Gst,AssocFlags)
+_CONV_ENUM(Gst,BufferCopyFlags)
+_CONV_ENUM(Gst,BufferFlag)
+_CONV_ENUM(Gst,ClockEntryType)
+_CONV_ENUM(Gst,ClockReturn)
+_CONV_ENUM(Gst,ClockTime)
+_CONV_ENUM(Gst,EventType)
+_CONV_ENUM(Gst,FlowReturn)
+_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)
+_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)
+_CONV_ENUM(Gst,TagMergeMode)
+_CONV_ENUM(Gst,TaskState)
+_CONV_ENUM(Gst,URIType)
 
 ###############Gstreamermm Class Conversions######################
 
@@ -157,33 +176,3 @@
 
 #Other Conversions
 _CONVERSION(`const xmlNodePtr',`xmlNodePtr',`const_cast<xmlNodePtr>($3)')
-
-#############################Enums####################################
-
-_CONV_ENUM(Gst,AssocFlags)
-_CONV_ENUM(Gst,BufferCopyFlags)
-_CONV_ENUM(Gst,BufferFlag)
-_CONV_ENUM(Gst,ClockEntryType)
-_CONV_ENUM(Gst,ClockReturn)
-_CONV_ENUM(Gst,ClockTime)
-_CONV_ENUM(Gst,EventType)
-_CONV_ENUM(Gst,FlowReturn)
-_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)
-_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)
-_CONV_ENUM(Gst,TagMergeMode)
-_CONV_ENUM(Gst,TaskState)
-_CONV_ENUM(Gst,URIType)

Added: gstreamermm/trunk/tools/m4/convert_gstbase.m4
==============================================================================
--- (empty file)
+++ gstreamermm/trunk/tools/m4/convert_gstbase.m4	Thu Jun 12 22:36:02 2008
@@ -0,0 +1,3 @@
+
+#GstBase::ColorBalanceChannel
+_CONVERSION(`const Glib::RefPtr<ColorBalanceChannel>&',`GstColorBalanceChannel*',`($3)->gobj()')
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]