gnomemm r1371 - in gstreamermm/trunk: . gstreamer/src

[jaalburqu svn gnome org]

Author: jaalburqu
Date: Mon Feb 25 22:05:01 2008
New Revision: 1371
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1371&view=rev

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

	* gstreamer/src/taglist.ccg:
	* gstreamer/src/taglist.hg: Removed SlotMerge code (which will not be
	needed because a merge callback is only required for registering new
	taglists which is done more appropriately in C API directly)

	* gstreamer/src/segment.hg: Removed unused whitespace

Modified:
   gstreamermm/trunk/ChangeLog
   gstreamermm/trunk/gstreamer/src/segment.hg
   gstreamermm/trunk/gstreamer/src/taglist.ccg
   gstreamermm/trunk/gstreamer/src/taglist.hg

Modified: gstreamermm/trunk/gstreamer/src/segment.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/segment.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/segment.hg	Mon Feb 25 22:05:01 2008
@@ -97,7 +97,6 @@
   _WRAP_METHOD(void set_seek(double rate, Format format, SeekFlags flags, SeekType start_type, gint64 start, SeekType stop_type, gint64 stop, bool& update), gst_segment_set_seek)
   _WRAP_METHOD(gint64 convert_to_running_time(Format format, gint64 position), gst_segment_to_running_time)
   _WRAP_METHOD(gint64 convert_to_stream_time(Format format, gint64 position), gst_segment_to_stream_time)
-
 };
 
 } //namespace Gst

Modified: gstreamermm/trunk/gstreamer/src/taglist.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/taglist.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/taglist.ccg	Mon Feb 25 22:05:01 2008
@@ -28,17 +28,6 @@
   Gst::TagList::SlotForeach& slot = *static_cast<Gst::TagList::SlotForeach*>(data);
   return slot(Glib::wrap(list), Glib::ustring(value));
 }
-
-static gboolean
-TagList_Merge_gstreamermm_callback(GValue *dest, const GValue *src, gpointer data)
-{
-  Glib::ValueBase val_base_dest, val_base_init;
-  va_base_dest.init(dest);
-  va_base_src.init(src);
-
-  Gst::TagList::SlotMap& slot = *static_cast<Gst::TagList::SlotMap*>(data);
-  return slot(va_base_dest, va_base_src);
-}
 */
 
 namespace Gst

Modified: gstreamermm/trunk/gstreamer/src/taglist.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/taglist.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/taglist.hg	Mon Feb 25 22:05:01 2008
@@ -34,11 +34,6 @@
    */
   typedef sigc::slot<void, const TagList&, const Glib::ustring&> SlotForeach;
 
-  /** For example,
-   * void on_merge(Glib::ValueBase& dest, const Glib::ValueBase& src);
-   */
-  typedef sigc::slot<void, Glib::ValueBase&, const Glib::ValueBase&> SlotMerge;
-
 public:
   void foreach(const SlotForeach& slot);
 };