From: Sebastian Pölsterl <sebp@k-d-w.org>
Date: Mon, 1 Oct 2012 18:03:43 +0000 (+0200)
Subject: rtsp-media-mapping: rename find_media vfunc to find_factory
X-Git-Tag: 1.19.3~495^2~1331
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5cec59737ba163409176af4a5e910aae177c8938;p=platform%2Fupstream%2Fgstreamer.git

rtsp-media-mapping: rename find_media vfunc to find_factory

The virtual method and class method should have the same name
so it is correctly represented in GIR file

https://bugzilla.gnome.org/show_bug.cgi?id=680777
---

diff --git a/gst/rtsp-server/rtsp-media-mapping.c b/gst/rtsp-server/rtsp-media-mapping.c
index ab2d2b5..8a28db9 100644
--- a/gst/rtsp-server/rtsp-media-mapping.c
+++ b/gst/rtsp-server/rtsp-media-mapping.c
@@ -26,7 +26,7 @@ GST_DEBUG_CATEGORY_STATIC (rtsp_media_debug);
 
 static void gst_rtsp_media_mapping_finalize (GObject * obj);
 
-static GstRTSPMediaFactory *find_media (GstRTSPMediaMapping * mapping,
+static GstRTSPMediaFactory *find_factory (GstRTSPMediaMapping * mapping,
     const GstRTSPUrl * url);
 
 static void
@@ -38,7 +38,7 @@ gst_rtsp_media_mapping_class_init (GstRTSPMediaMappingClass * klass)
 
   gobject_class->finalize = gst_rtsp_media_mapping_finalize;
 
-  klass->find_media = find_media;
+  klass->find_factory = find_factory;
 
   GST_DEBUG_CATEGORY_INIT (rtsp_media_debug, "rtspmediamapping", 0,
       "GstRTSPMediaMapping");
@@ -76,7 +76,7 @@ gst_rtsp_media_mapping_new (void)
 }
 
 static GstRTSPMediaFactory *
-find_media (GstRTSPMediaMapping * mapping, const GstRTSPUrl * url)
+find_factory (GstRTSPMediaMapping * mapping, const GstRTSPUrl * url)
 {
   GstRTSPMediaFactory *result;
 
@@ -111,8 +111,8 @@ gst_rtsp_media_mapping_find_factory (GstRTSPMediaMapping * mapping,
 
   klass = GST_RTSP_MEDIA_MAPPING_GET_CLASS (mapping);
 
-  if (klass->find_media)
-    result = klass->find_media (mapping, url);
+  if (klass->find_factory)
+    result = klass->find_factory (mapping, url);
   else
     result = NULL;
 
diff --git a/gst/rtsp-server/rtsp-media-mapping.h b/gst/rtsp-server/rtsp-media-mapping.h
index 5c3e46f..19f1acf 100644
--- a/gst/rtsp-server/rtsp-media-mapping.h
+++ b/gst/rtsp-server/rtsp-media-mapping.h
@@ -54,7 +54,7 @@ struct _GstRTSPMediaMapping {
 
 /**
  * GstRTSPMediaMappingClass:
- * @find_media: Create or return a previously cached #GstRTSPMediaFactory object
+ * @find_factory: Create or return a previously cached #GstRTSPMediaFactory object
  *        for the given url. the default implementation will use the mappings
  *        added with gst_rtsp_media_mapping_add_factory().
  *
@@ -63,7 +63,7 @@ struct _GstRTSPMediaMapping {
 struct _GstRTSPMediaMappingClass {
   GObjectClass  parent_class;
 
-  GstRTSPMediaFactory * (*find_media)  (GstRTSPMediaMapping *mapping, const GstRTSPUrl *url);
+  GstRTSPMediaFactory * (*find_factory)  (GstRTSPMediaMapping *mapping, const GstRTSPUrl *url);
 };
 
 GType                 gst_rtsp_media_mapping_get_type     (void);