[gstreamermm] Gst::BaseSink: use macros for wrapping some virtual methods.

[Marcin Kolny <mkolny src gnome org>]

commit a1738ab7e3a97a203ee7e40d7973d6bd8f5a2dd9
Author: Michał Wróbel <michal wrobel flytronic pl>
Date:   Sun Jun 28 00:14:06 2015 +0200

    Gst::BaseSink: use macros for wrapping some virtual methods.
    
        * gstreamer/src/basesink.ccg:
        * gstreamer/src/basesink.hg: use _VRAP_VFUNC macro with return_value
          parameter for generating event_vfunc and set_caps_vfunc methods
          instead of handcrafted code.

 gstreamer/src/basesink.ccg |  105 --------------------------------------------
 gstreamer/src/basesink.hg  |    8 +---
 2 files changed, 2 insertions(+), 111 deletions(-)
---
diff --git a/gstreamer/src/basesink.ccg b/gstreamer/src/basesink.ccg
index 97905ac..65875ac 100644
--- a/gstreamer/src/basesink.ccg
+++ b/gstreamer/src/basesink.ccg
@@ -51,59 +51,6 @@ FlowReturn BaseSink::wait(ClockTime time)
   return static_cast<FlowReturn>(gst_base_sink_wait(const_cast<GstBaseSink*>(gobj()), 
static_cast<GstClockTime>(time), 0));
 }
 
-gboolean BaseSink_Class::set_caps_vfunc_callback(GstBaseSink* self, GstCaps* caps)
-{
-  Glib::ObjectBase *const obj_base = static_cast<Glib::ObjectBase*>(
-      Glib::ObjectBase::_get_current_wrapper((GObject*)self));
-
-  // Non-gtkmmproc-generated custom classes implicitly call the default
-  // Glib::ObjectBase constructor, which sets is_derived_. But gtkmmproc-
-  // generated classes can use this optimisation, which avoids the unnecessary
-  // parameter conversions if there is no possibility of the virtual function
-  // being overridden:
-  if(obj_base && obj_base->is_derived_())
-  {
-    CppObjectType *const obj = dynamic_cast<CppObjectType* const>(obj_base);
-    if(obj) // This can be NULL during destruction.
-    {
-      #ifdef GLIBMM_EXCEPTIONS_ENABLED
-      try // Trap C++ exceptions which would normally be lost because this is a C callback.
-      {
-      #endif //GLIBMM_EXCEPTIONS_ENABLED
-        // Call the virtual member method, which derived classes might override.
-        return static_cast<int>(obj->set_caps_vfunc(Glib::wrap(caps, true)
-));
-      #ifdef GLIBMM_EXCEPTIONS_ENABLED
-      }
-      catch(...)
-      {
-        Glib::exception_handlers_invoke();
-      }
-      #endif //GLIBMM_EXCEPTIONS_ENABLED
-    }
-  }
-  
-  BaseClassType *const base = static_cast<BaseClassType*>(
-      g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The 
original underlying C class).
-  );
-
-  // Call the original underlying C function:
-  if(base && base->set_caps)
-    return (*base->set_caps)(self, caps);
-
-  return true;
-}
-bool Gst::BaseSink::set_caps_vfunc(const Glib::RefPtr<Gst::Caps>& caps) 
-{
-  BaseClassType *const base = static_cast<BaseClassType*>(
-      g_type_class_peek_parent(G_OBJECT_GET_CLASS(gobject_)) // Get the parent class of the object class 
(The original underlying C class).
-  );
-
-  if(base && base->set_caps)
-    return (*base->set_caps)(gobj(),Glib::unwrap(caps));
-
-  return true;
-}
 gboolean BaseSink_Class::start_vfunc_callback(GstBaseSink* self)
 {
   Glib::ObjectBase *const obj_base = static_cast<Glib::ObjectBase*>(
@@ -260,59 +207,7 @@ bool Gst::BaseSink::unlock_vfunc()
 
   return true;
 }
-gboolean BaseSink_Class::event_vfunc_callback(GstBaseSink* self, GstEvent* event)
-{
-  Glib::ObjectBase *const obj_base = static_cast<Glib::ObjectBase*>(
-      Glib::ObjectBase::_get_current_wrapper((GObject*)self));
 
-  // Non-gtkmmproc-generated custom classes implicitly call the default
-  // Glib::ObjectBase constructor, which sets is_derived_. But gtkmmproc-
-  // generated classes can use this optimisation, which avoids the unnecessary
-  // parameter conversions if there is no possibility of the virtual function
-  // being overridden:
-  if(obj_base && obj_base->is_derived_())
-  {
-    CppObjectType *const obj = dynamic_cast<CppObjectType* const>(obj_base);
-    if(obj) // This can be NULL during destruction.
-    {
-      #ifdef GLIBMM_EXCEPTIONS_ENABLED
-      try // Trap C++ exceptions which would normally be lost because this is a C callback.
-      {
-      #endif //GLIBMM_EXCEPTIONS_ENABLED
-        // Call the virtual member method, which derived classes might override.
-        return static_cast<int>(obj->event_vfunc(Glib::wrap(event, true)
-));
-      #ifdef GLIBMM_EXCEPTIONS_ENABLED
-      }
-      catch(...)
-      {
-        Glib::exception_handlers_invoke();
-      }
-      #endif //GLIBMM_EXCEPTIONS_ENABLED
-    }
-  }
-  
-  BaseClassType *const base = static_cast<BaseClassType*>(
-      g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The 
original underlying C class).
-  );
-
-  // Call the original underlying C function:
-  if(base && base->event)
-    return (*base->event)(self, event);
-
-  return true;
-}
-bool Gst::BaseSink::event_vfunc(const Glib::RefPtr<Gst::Event>& event) 
-{
-  BaseClassType *const base = static_cast<BaseClassType*>(
-      g_type_class_peek_parent(G_OBJECT_GET_CLASS(gobject_)) // Get the parent class of the object class 
(The original underlying C class).
-  );
-
-  if(base && base->event)
-    return (*base->event)(gobj(),Glib::unwrap(event));
-
-  return true;
-}
 gboolean BaseSink_Class::activate_pull_vfunc_callback(GstBaseSink* self, gboolean active)
 {
   Glib::ObjectBase *const obj_base = static_cast<Glib::ObjectBase*>(
diff --git a/gstreamer/src/basesink.hg b/gstreamer/src/basesink.hg
index a8914f3..c862c8f 100644
--- a/gstreamer/src/basesink.hg
+++ b/gstreamer/src/basesink.hg
@@ -241,7 +241,7 @@ public:
 #m4 _CONVERSION(`GstCaps*', `const Glib::RefPtr<Gst::Caps>&', `Glib::wrap($3, true)')
   /** Notify subclass of changed caps.
    */
-   virtual bool set_caps_vfunc(const Glib::RefPtr<Gst::Caps>& caps);
+  _WRAP_VFUNC(bool set_caps(const Glib::RefPtr<Gst::Caps>& caps), "set_caps", return_value true)
 
 #m4 _CONVERSION(`GstBuffer*', `const Glib::RefPtr<Gst::Buffer>&', `Glib::wrap($3, true)')
 #m4 _CONVERSION(`GstClockTime*', `ClockTime&', `*($3)')
@@ -266,7 +266,7 @@ public:
 #m4 _CONVERSION(`GstEvent*', `const Glib::RefPtr<Gst::Event>&', `Glib::wrap($3, true)')
   /** Override this to handle events arriving on the sink pad.
    */
-  virtual bool event_vfunc(const Glib::RefPtr<Gst::Event>& event);
+  _WRAP_VFUNC(bool event(const Glib::RefPtr<Gst::Event>& event), "event", return_value true)
 
   /** Called to present the preroll buffer if desired.
    */
@@ -309,19 +309,15 @@ public:
 protected:
 #m4begin
   _PUSH(SECTION_PCC_CLASS_INIT_VFUNCS)
-  klass->set_caps = &set_caps_vfunc_callback;
   klass->start = &start_vfunc_callback;
   klass->stop = &stop_vfunc_callback;
   klass->unlock = &unlock_vfunc_callback;
-  klass->event = &event_vfunc_callback;
   klass->activate_pull = &activate_pull_vfunc_callback;
   klass->unlock_stop = &unlock_stop_vfunc_callback;
   _SECTION(SECTION_PH_VFUNCS)
-  static gboolean set_caps_vfunc_callback(GstBaseSink* self, GstCaps* caps);
   static gboolean start_vfunc_callback(GstBaseSink* self);
   static gboolean stop_vfunc_callback(GstBaseSink* self);
   static gboolean unlock_vfunc_callback(GstBaseSink* self);
-  static gboolean event_vfunc_callback(GstBaseSink* self, GstEvent* event);
   static gboolean activate_pull_vfunc_callback(GstBaseSink* self, gboolean active);
   static gboolean unlock_stop_vfunc_callback(GstBaseSink* self);
   _POP()