API cleanup: (s/g)et_sched -> _scheduler

Original commit message from CVS:
API cleanup: (s/g)et_sched -> _scheduler

diff --git a/docs/gst/gstreamer-sections.txt b/docs/gst/gstreamer-sections.txt
index 0de1262..522e12d 100644 (file)
--- a/docs/gst/gstreamer-sections.txt
+++ b/docs/gst/gstreamer-sections.txt
@@ -361,8 +361,8 @@ GstElementSetClockFunction
 
 gst_element_set_loop_function
 GstElementLoopFunction
-gst_element_get_sched
-gst_element_set_sched
+gst_element_get_scheduler
+gst_element_set_scheduler
 gst_element_get_parent
 gst_element_set_parent
 gst_element_get_managing_bin
@@ -603,9 +603,9 @@ gst_pad_set_element_private
 gst_pad_get_element_private
 gst_pad_set_parent
 gst_pad_get_parent
-gst_pad_get_sched
-gst_pad_set_sched
-gst_pad_unset_sched
+gst_pad_get_scheduler
+gst_pad_set_scheduler
+gst_pad_unset_scheduler
 gst_pad_get_real_parent
 gst_pad_add_ghost_pad
 gst_pad_remove_ghost_pad

diff --git a/docs/gst/tmpl/gstelement.sgml b/docs/gst/tmpl/gstelement.sgml
index 22ff62f..4311676 100644 (file)
--- a/docs/gst/tmpl/gstelement.sgml
+++ b/docs/gst/tmpl/gstelement.sgml
@@ -470,7 +470,7 @@ circumstances.
 @element: The element in question.
 
 
-<!-- ##### FUNCTION gst_element_get_sched ##### -->
+<!-- ##### FUNCTION gst_element_get_scheduler ##### -->
 <para>
 
 </para>
@@ -479,7 +479,7 @@ circumstances.
 @Returns: 
 
 
-<!-- ##### FUNCTION gst_element_set_sched ##### -->
+<!-- ##### FUNCTION gst_element_set_scheduler ##### -->
 <para>
 
 </para>

diff --git a/docs/gst/tmpl/gstpad.sgml b/docs/gst/tmpl/gstpad.sgml
index 97a3322..43be1e4 100644 (file)
--- a/docs/gst/tmpl/gstpad.sgml
+++ b/docs/gst/tmpl/gstpad.sgml
@@ -449,7 +449,7 @@ Destroy the pad.
 @Returns: 
 
 
-<!-- ##### FUNCTION gst_pad_get_sched ##### -->
+<!-- ##### FUNCTION gst_pad_get_scheduler ##### -->
 <para>
 
 </para>
@@ -458,7 +458,7 @@ Destroy the pad.
 @Returns: 
 
 
-<!-- ##### FUNCTION gst_pad_set_sched ##### -->
+<!-- ##### FUNCTION gst_pad_set_scheduler ##### -->
 <para>
 
 </para>
@@ -467,7 +467,7 @@ Destroy the pad.
 @sched: 
 
 
-<!-- ##### FUNCTION gst_pad_unset_sched ##### -->
+<!-- ##### FUNCTION gst_pad_unset_scheduler ##### -->
 <para>
 
 </para>

diff --git a/gst/gstelement.c b/gst/gstelement.c
index 95e0536..4b80c2f 100644 (file)
--- a/gst/gstelement.c
+++ b/gst/gstelement.c
@@ -1785,7 +1785,7 @@ gst_element_interrupt (GstElement *element)
 }
 
 /**
- * gst_element_set_sched:
+ * gst_element_set_scheduler:
  * @element: Element to set manager of.
  * @sched: @GstScheduler to set.
  *
@@ -1793,7 +1793,7 @@ gst_element_interrupt (GstElement *element)
  * writing a new bin subclass.
  */
 void
-gst_element_set_sched (GstElement *element,
+gst_element_set_scheduler (GstElement *element,
                       GstScheduler *sched)
 {
   g_return_if_fail (GST_IS_ELEMENT (element));
@@ -1804,7 +1804,7 @@ gst_element_set_sched (GstElement *element,
 }
 
 /**
- * gst_element_get_sched:
+ * gst_element_get_scheduler:
  * @element: Element to get manager of.
  *
  * Returns the scheduler of the element.
@@ -1812,7 +1812,7 @@ gst_element_set_sched (GstElement *element,
  * Returns: Element's scheduler
  */
 GstScheduler*
-gst_element_get_sched (GstElement *element)
+gst_element_get_scheduler (GstElement *element)
 {
   g_return_val_if_fail (GST_IS_ELEMENT (element), NULL);
 

diff --git a/gst/gstelement.h b/gst/gstelement.h
index 7b02291..a8a6a6c 100644 (file)
--- a/gst/gstelement.h
+++ b/gst/gstelement.h
@@ -194,8 +194,8 @@ GstClockReturn              gst_element_clock_wait          (GstElement *element, GstClock *clock,
 
 void                   gst_element_yield               (GstElement *element);
 gboolean               gst_element_interrupt           (GstElement *element);
-void                   gst_element_set_sched           (GstElement *element, GstScheduler *sched);
-GstScheduler*          gst_element_get_sched           (GstElement *element);
+void                   gst_element_set_scheduler       (GstElement *element, GstScheduler *sched);
+GstScheduler*          gst_element_get_scheduler       (GstElement *element);
 
 void                   gst_element_add_pad             (GstElement *element, GstPad *pad);
 void                   gst_element_remove_pad          (GstElement *element, GstPad *pad);

diff --git a/gst/gstpad.c b/gst/gstpad.c
index 361cafa..b0b9451 100644 (file)
--- a/gst/gstpad.c
+++ b/gst/gstpad.c
@@ -817,14 +817,14 @@ gst_pad_get_pad_template (GstPad *pad)
 
 
 /**
- * gst_pad_set_sched:
+ * gst_pad_set_scheduler:
  * @pad: the pad to set the scheduler for
  * @sched: The scheduler to set
  *
  * Set the scheduler for the pad
  */
 void
-gst_pad_set_sched (GstPad *pad, GstScheduler *sched)
+gst_pad_set_scheduler (GstPad *pad, GstScheduler *sched)
 {
   g_return_if_fail (pad != NULL);
   g_return_if_fail (GST_IS_PAD (pad));
@@ -833,7 +833,7 @@ gst_pad_set_sched (GstPad *pad, GstScheduler *sched)
 }
  
 /**
- * gst_pad_get_sched:
+ * gst_pad_get_scheduler:
  * @pad: the pad to get the scheduler from
  *
  * Get the scheduler of the pad
@@ -841,7 +841,7 @@ gst_pad_set_sched (GstPad *pad, GstScheduler *sched)
  * Returns: the scheduler of the pad.
  */
 GstScheduler*
-gst_pad_get_sched (GstPad *pad)
+gst_pad_get_scheduler (GstPad *pad)
 {
   g_return_val_if_fail (pad != NULL, NULL);
   g_return_val_if_fail (GST_IS_PAD (pad), NULL);
@@ -850,13 +850,13 @@ gst_pad_get_sched (GstPad *pad)
 }
 
 /**
- * gst_pad_unset_sched:
+ * gst_pad_unset_scheduler:
  * @pad: the pad to unset the scheduler for
  *
  * Unset the scheduler for the pad
  */
 void
-gst_pad_unset_sched (GstPad *pad)
+gst_pad_unset_scheduler (GstPad *pad)
 {
   g_return_if_fail (pad != NULL);
   g_return_if_fail (GST_IS_PAD (pad));

diff --git a/gst/gstpad.h b/gst/gstpad.h
index 5bab8ac..285a667 100644 (file)
--- a/gst/gstpad.h
+++ b/gst/gstpad.h
@@ -373,9 +373,9 @@ void                        gst_pad_set_parent                      (GstPad *pad, GstObject *parent);
 GstElement*            gst_pad_get_parent                      (GstPad *pad);
 GstElement*            gst_pad_get_real_parent                 (GstPad *pad);
 
-void                   gst_pad_set_sched                       (GstPad *pad, GstScheduler *sched);
-GstScheduler*          gst_pad_get_sched                       (GstPad *pad);
-void                   gst_pad_unset_sched                     (GstPad *pad);
+void                   gst_pad_set_scheduler                   (GstPad *pad, GstScheduler *sched);
+GstScheduler*          gst_pad_get_scheduler                   (GstPad *pad);
+void                   gst_pad_unset_scheduler                 (GstPad *pad);
 
 void                   gst_pad_add_ghost_pad                   (GstPad *pad, GstPad *ghostpad);
 void                   gst_pad_remove_ghost_pad                (GstPad *pad, GstPad *ghostpad);

diff --git a/gst/gstscheduler.c b/gst/gstscheduler.c
index c09b4d7..46de9a5 100644 (file)
--- a/gst/gstscheduler.c
+++ b/gst/gstscheduler.c
@@ -218,7 +218,7 @@ gst_scheduler_remove_element (GstScheduler *sched, GstElement *element)
     GstPad *pad = GST_PAD (pads->data);
     
     if (GST_IS_REAL_PAD (pad)) {
-      gst_pad_unset_sched (GST_PAD (pads->data));
+      gst_pad_unset_scheduler (GST_PAD (pads->data));
     }
   }
 }

diff --git a/gst/schedulers/gstbasicscheduler.c b/gst/schedulers/gstbasicscheduler.c
index 2082be6..32b847f 100644 (file)
--- a/gst/schedulers/gstbasicscheduler.c
+++ b/gst/schedulers/gstbasicscheduler.c
@@ -960,7 +960,7 @@ gst_basic_scheduler_add_element (GstScheduler * sched, GstElement * element)
       continue;
 
     /* set the pad's sched pointer */
-    gst_pad_set_sched (pad, sched);
+    gst_pad_set_scheduler (pad, sched);
 
     /* if the peer element exists and is a candidate */
     if (GST_PAD_PEER (pad)) {

diff --git a/gst/schedulers/gstfastscheduler.c b/gst/schedulers/gstfastscheduler.c
index 2b5aac1..d9704aa 100644 (file)
--- a/gst/schedulers/gstfastscheduler.c
+++ b/gst/schedulers/gstfastscheduler.c
@@ -700,7 +700,7 @@ gst_fast_scheduler_add_element (GstScheduler * sched, GstElement * element)
       continue;
 
     /* set the pad's sched pointer */
-    gst_pad_set_sched (pad, sched);
+    gst_pad_set_scheduler (pad, sched);
 
     /* if the peer element exists and is a candidate */
     if (GST_PAD_PEER (pad)) {