[gstreamermm] Gst::Pad: replaced friend functions by static methods.



commit 56bae168ab88b6ffd664117342bb8917f9f977f1
Author: Marcin Kolny <marcin kolny flytronic pl>
Date:   Thu Aug 21 15:43:02 2014 +0200

    Gst::Pad: replaced friend functions by static methods.
    
        * gstreamer/src/pad.{ccg|hg}: made chain, query, event, activate,
          activatemode and getrange methods static.

 gstreamer/src/pad.ccg |   12 ++++++------
 gstreamer/src/pad.hg  |   12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/gstreamer/src/pad.ccg b/gstreamer/src/pad.ccg
index 087f89f..0ac5f89 100644
--- a/gstreamer/src/pad.ccg
+++ b/gstreamer/src/pad.ccg
@@ -166,7 +166,7 @@ FlowReturn Pad::chain(Glib::RefPtr<Gst::Buffer>& buffer)
   return FlowReturn(gst_pad_chain(gobj(), buffer->gobj()));
 }
 
-GstFlowReturn Pad_Chain_gstreamermm_callback(GstPad* pad, GstObject*, GstBuffer *buffer)
+GstFlowReturn Pad::Pad_Chain_gstreamermm_callback(GstPad* pad, GstObject*, GstBuffer *buffer)
 {
   //FIXME: It's made like vfunc wrappers, but why there is no reffing of pad?
   Gst::Pad *pad_wrapper = dynamic_cast<Gst::Pad*>
@@ -193,7 +193,7 @@ GstFlowReturn Pad_Chain_gstreamermm_callback(GstPad* pad, GstObject*, GstBuffer
   return GST_FLOW_ERROR;
 }
 
-gboolean Pad_Query_gstreamermm_callback(GstPad* pad, GstObject*, GstQuery* query)
+gboolean Pad::Pad_Query_gstreamermm_callback(GstPad* pad, GstObject*, GstQuery* query)
 {
   Gst::Pad *pad_wrapper = dynamic_cast<Gst::Pad*>
     (static_cast<Glib::ObjectBase*>(
@@ -222,7 +222,7 @@ gboolean Pad_Query_gstreamermm_callback(GstPad* pad, GstObject*, GstQuery* query
   return false;
 }
 
-gboolean Pad_Event_gstreamermm_callback(GstPad* pad, GstObject*, GstEvent* event)
+gboolean Pad::Pad_Event_gstreamermm_callback(GstPad* pad, GstObject*, GstEvent* event)
 {
   Gst::Pad *pad_wrapper = dynamic_cast<Gst::Pad*>
     (static_cast<Glib::ObjectBase*>(
@@ -246,7 +246,7 @@ gboolean Pad_Event_gstreamermm_callback(GstPad* pad, GstObject*, GstEvent* event
   return false;
 }
 
-gboolean Pad_Activate_gstreamermm_callback(GstPad* pad, GstObject*)
+gboolean Pad::Pad_Activate_gstreamermm_callback(GstPad* pad, GstObject*)
 {
   Gst::Pad *pad_wrapper = dynamic_cast<Gst::Pad*>
     (static_cast<Glib::ObjectBase*>(
@@ -267,7 +267,7 @@ gboolean Pad_Activate_gstreamermm_callback(GstPad* pad, GstObject*)
   return false;
 }
 
-gboolean Pad_Activatemode_gstreamermm_callback(GstPad* pad, GstObject*, GstPadMode mode, gboolean active)
+gboolean Pad::Pad_Activatemode_gstreamermm_callback(GstPad* pad, GstObject*, GstPadMode mode, gboolean 
active)
 {
   Gst::Pad *pad_wrapper = dynamic_cast<Gst::Pad*>
     (static_cast<Glib::ObjectBase*>(
@@ -288,7 +288,7 @@ gboolean Pad_Activatemode_gstreamermm_callback(GstPad* pad, GstObject*, GstPadMo
   return false;
 }
 
-GstFlowReturn Pad_Getrange_gstreamermm_callback(GstPad* pad, GstObject*, guint64 offset, guint length, 
GstBuffer **buffer)
+GstFlowReturn Pad::Pad_Getrange_gstreamermm_callback(GstPad* pad, GstObject*, guint64 offset, guint length, 
GstBuffer **buffer)
 {
   Gst::Pad *pad_wrapper = dynamic_cast<Gst::Pad*>
     (static_cast<Glib::ObjectBase*>(
diff --git a/gstreamer/src/pad.hg b/gstreamer/src/pad.hg
index 64adba6..b875b8d 100644
--- a/gstreamer/src/pad.hg
+++ b/gstreamer/src/pad.hg
@@ -353,17 +353,17 @@ public:
 
   _WRAP_METHOD(Glib::RefPtr<Gst::Event> get_sticky_event(Gst::EventType event_type, guint idx) const, 
gst_pad_get_sticky_event)
 
-  friend GstFlowReturn Pad_Chain_gstreamermm_callback(GstPad* pad, GstObject* parent, GstBuffer *buffer);
+  static GstFlowReturn Pad_Chain_gstreamermm_callback(GstPad* pad, GstObject* parent, GstBuffer *buffer);
   void set_chain_function(const SlotChain& slot);
-  friend gboolean Pad_Event_gstreamermm_callback(GstPad* pad, GstObject* parent, GstEvent* event);
+  static gboolean Pad_Event_gstreamermm_callback(GstPad* pad, GstObject* parent, GstEvent* event);
   void set_event_function(const SlotEvent& slot);
-  friend gboolean Pad_Query_gstreamermm_callback(GstPad* pad, GstObject* parent, GstQuery* query);
+  static gboolean Pad_Query_gstreamermm_callback(GstPad* pad, GstObject* parent, GstQuery* query);
   void set_query_function(const SlotQuery& slot);
-  friend gboolean Pad_Activate_gstreamermm_callback(GstPad* pad, GstObject* parent);
+  static gboolean Pad_Activate_gstreamermm_callback(GstPad* pad, GstObject* parent);
   void set_activate_function(const SlotActivate& slot);
-  friend gboolean Pad_Activatemode_gstreamermm_callback(GstPad* pad, GstObject* parent, GstPadMode mode, 
gboolean active);
+  static gboolean Pad_Activatemode_gstreamermm_callback(GstPad* pad, GstObject* parent, GstPadMode mode, 
gboolean active);
   void set_activatemode_function(const SlotActivatemode& slot);
-  friend GstFlowReturn Pad_Getrange_gstreamermm_callback(GstPad* pad, GstObject* parent, guint64 offset, 
guint length, GstBuffer **buffer);
+  static GstFlowReturn Pad_Getrange_gstreamermm_callback(GstPad* pad, GstObject* parent, guint64 offset, 
guint length, GstBuffer **buffer);
   void set_getrange_function(const SlotGetrange& slot);
 
     //C API specific pad callback setting functions are ignored.


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]