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

[jaalburqu svn gnome org]

Author: jaalburqu
Date: Wed Jun 18 04:36:39 2008
New Revision: 1567
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1567&view=rev

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

	* gstreamer/src/caps.hg: Renamed some methods, but if there are more
	appropriate names for these, they should be renamed.
	* gstreamer/src/format.ccg:
	* gstreamer/src/format.hg: Removed register_format() because this
	seems to extend gstreamer and this might be best in gstreamer API for
	now. Also removed format_contains_format() because it doesn't seem
	very useful right now.

Modified:
   gstreamermm/trunk/ChangeLog
   gstreamermm/trunk/gstreamer/src/caps.hg
   gstreamermm/trunk/gstreamer/src/format.ccg
   gstreamermm/trunk/gstreamer/src/format.hg

Modified: gstreamermm/trunk/gstreamer/src/caps.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/caps.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/caps.hg	Wed Jun 18 04:36:39 2008
@@ -150,7 +150,6 @@
   _WRAP_METHOD(bool is_always_compatible(const Glib::RefPtr<Caps>& other_caps) const, gst_caps_is_always_compatible)
   _WRAP_METHOD(bool is_subset(const Glib::RefPtr<Caps>& superset_caps) const, gst_caps_is_subset)
 
-  //TODO: get_*() is not very nice for these, but create_*() is for static create_*() by convention:
   //This is const (returns a non const) because it always creates a new instance:
   _WRAP_METHOD(Glib::RefPtr<Caps> get_intersect(const Glib::RefPtr<Caps>& other_caps) const, gst_caps_intersect)
 
@@ -158,7 +157,7 @@
   _WRAP_METHOD(Glib::RefPtr<Caps> get_union(const Glib::RefPtr<Caps>& other_caps) const, gst_caps_union)
 
   //This is const (returns a non const) because it always creates a new instance:
-  _WRAP_METHOD(Glib::RefPtr<Caps> get_normalize() const, gst_caps_normalize)
+  _WRAP_METHOD(Glib::RefPtr<Caps> get_normal() const, gst_caps_normalize)
 
   _WRAP_METHOD(bool simplify(), gst_caps_do_simplify)
 
@@ -168,7 +167,7 @@
 
   _WRAP_METHOD(Glib::ustring to_string() const, gst_caps_to_string)
 
-  _WRAP_METHOD(Glib::RefPtr<Caps> get_subtract(const Glib::RefPtr<const Caps>& subtrahend_caps) const, gst_caps_subtract)
+  _WRAP_METHOD(Glib::RefPtr<Caps> get_difference(const Glib::RefPtr<const Caps>& subtrahend_caps) const, gst_caps_subtract)
   _WRAP_METHOD(Glib::RefPtr<Caps> make_writable(), gst_caps_make_writable)
   _WRAP_METHOD(void truncate(), gst_caps_truncate)
   

Modified: gstreamermm/trunk/gstreamer/src/format.ccg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/format.ccg	(original)
+++ gstreamermm/trunk/gstreamer/src/format.ccg	Wed Jun 18 04:36:39 2008
@@ -34,27 +34,11 @@
   return Glib::QueryQuark(gst_format_to_quark(GstFormat(f)));
 }
 
-//TODO: should gst_format_register() be wrapped?  It seems like it would be
-//extending GStreamer which may be best done with C API directly
-Format register_format(const Glib::ustring& nick, const Glib::ustring& description)
-{
-  return Format(gst_format_register(nick.c_str(), description.c_str()));
-}
-
 Format get_format(const Glib::ustring& nick)
 {
   return Format(gst_format_get_by_nick(nick.c_str()));
 }
 
-//TODO: first arg is an array of Formats
-/*
-bool formats_contain_format(const Format& formats, Format format)
-{
-  GstFormat gstformats = GstFormat(formats);
-  return gst_formats_contains(&gstformats, GstFormat(format));
-}
-*/
-
 bool get_details(Format format, FormatDefinition &def)
 {
   const GstFormatDefinition* gstdef = gst_format_get_details(GstFormat(format));

Modified: gstreamermm/trunk/gstreamer/src/format.hg
==============================================================================
--- gstreamermm/trunk/gstreamer/src/format.hg	(original)
+++ gstreamermm/trunk/gstreamer/src/format.hg	Wed Jun 18 04:36:39 2008
@@ -62,16 +62,6 @@
  */
 Glib::QueryQuark get_quark(Format f);
 
-/** Create a new Gst::Format based on the nick or return an already registered
- * format with that nick.
- *
- * @param nick The nick of the new format.
- * @param description The description of the new format.
- * @return A new Gst::Format or an already registered format with the same
- * nick. MT safe.
- */
-Format register_format(const Glib::ustring& nick, const Glib::ustring&description);
-
 /** Return the format registered with the given nick.
  *
  * @param nick The nick of the format.
@@ -80,9 +70,6 @@
  */
 Format get_format(const Glib::ustring& nick);
 
-//TODO: first arg is an array of Formats
-//bool formats_contain_format(const Format& formats, Format format);
-
 /** Get details about the given format.
  *
  * @param format The format to get details of.