From c811e86d6b53cbefc71863a49fe3313318a59fd5 Mon Sep 17 00:00:00 2001 From: Tim-Philipp Müller Date: Wed, 10 May 2017 00:11:10 +0100 Subject: libs: controller: mark symbols explicitly for export with GST_EXPORT --- common | 2 +- libs/gst/controller/Makefile.am | 1 + libs/gst/controller/controller_mkenum.py | 4 ++-- libs/gst/controller/gstargbcontrolbinding.h | 2 ++ libs/gst/controller/gstdirectcontrolbinding.h | 4 +++- libs/gst/controller/gstinterpolationcontrolsource.h | 2 ++ libs/gst/controller/gstlfocontrolsource.h | 2 ++ libs/gst/controller/gstproxycontrolbinding.h | 13 ++++++++----- libs/gst/controller/gsttimedvaluecontrolsource.h | 17 +++++++++++++++-- libs/gst/controller/gsttriggercontrolsource.h | 2 ++ 10 files changed, 38 insertions(+), 11 deletions(-) diff --git a/common b/common index 48a5d85eb..29046b89d 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 48a5d85ebf4a0bad1c997c83100f710fe2154fbf +Subproject commit 29046b89d80bbca22eb222c18820fb40a4ac5bde diff --git a/libs/gst/controller/Makefile.am b/libs/gst/controller/Makefile.am index 920f84f79..fae7a2f33 100644 --- a/libs/gst/controller/Makefile.am +++ b/libs/gst/controller/Makefile.am @@ -7,6 +7,7 @@ glib_enum_headers= \ glib_enum_define = GST_CONTROLLER glib_gen_prefix = gst glib_gen_basename = controller +glib_gen_decl_banner=GST_EXPORT built_sources = controller-enumtypes.c built_headers = controller-enumtypes.h diff --git a/libs/gst/controller/controller_mkenum.py b/libs/gst/controller/controller_mkenum.py index f7fbc2151..a9fc18200 100755 --- a/libs/gst/controller/controller_mkenum.py +++ b/libs/gst/controller/controller_mkenum.py @@ -8,11 +8,11 @@ import sys, os, shutil, subprocess h_array = ['--fhead', - "#ifndef __GST_CONTROLLER_ENUM_TYPES_H__\n#define __GST_CONTROLLER_ENUM_TYPES_H__\n\n#include \n\nG_BEGIN_DECLS\n", + "#ifndef __GST_CONTROLLER_ENUM_TYPES_H__\n#define __GST_CONTROLLER_ENUM_TYPES_H__\n\n#include \n#include \n\nG_BEGIN_DECLS\n", '--fprod', "\n/* enumerations from \"@filename@\" */\n", '--vhead', - 'GType @enum_name@_get_type (void);\n#define GST_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n', + 'GST_EXPORT\nGType @enum_name@_get_type (void);\n#define GST_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n', '--ftail', 'G_END_DECLS\n\n#endif /* __GST_CONTROLLER_ENUM_TYPES_H__ */', ] diff --git a/libs/gst/controller/gstargbcontrolbinding.h b/libs/gst/controller/gstargbcontrolbinding.h index c698b075e..0e7224f0c 100644 --- a/libs/gst/controller/gstargbcontrolbinding.h +++ b/libs/gst/controller/gstargbcontrolbinding.h @@ -85,10 +85,12 @@ struct _GstARGBControlBindingClass gpointer _gst_reserved[GST_PADDING]; }; +GST_EXPORT GType gst_argb_control_binding_get_type (void); /* Functions */ +GST_EXPORT GstControlBinding * gst_argb_control_binding_new (GstObject * object, const gchar * property_name, GstControlSource * cs_a, GstControlSource * cs_r, GstControlSource * cs_g, GstControlSource * cs_b); diff --git a/libs/gst/controller/gstdirectcontrolbinding.h b/libs/gst/controller/gstdirectcontrolbinding.h index 5732ad82c..6681fce25 100644 --- a/libs/gst/controller/gstdirectcontrolbinding.h +++ b/libs/gst/controller/gstdirectcontrolbinding.h @@ -109,13 +109,15 @@ struct _GstDirectControlBindingClass gpointer _gst_reserved[GST_PADDING]; }; +GST_EXPORT GType gst_direct_control_binding_get_type (void); /* Functions */ +GST_EXPORT GstControlBinding * gst_direct_control_binding_new (GstObject * object, const gchar * property_name, GstControlSource * cs); - +GST_EXPORT GstControlBinding * gst_direct_control_binding_new_absolute (GstObject * object, const gchar * property_name, GstControlSource * cs); diff --git a/libs/gst/controller/gstinterpolationcontrolsource.h b/libs/gst/controller/gstinterpolationcontrolsource.h index 3ce3193cd..3f8c0b7b4 100644 --- a/libs/gst/controller/gstinterpolationcontrolsource.h +++ b/libs/gst/controller/gstinterpolationcontrolsource.h @@ -89,10 +89,12 @@ struct _GstInterpolationControlSourceClass { gpointer _gst_reserved[GST_PADDING]; }; +GST_EXPORT GType gst_interpolation_control_source_get_type (void); /* Functions */ +GST_EXPORT GstControlSource * gst_interpolation_control_source_new (void); #ifdef G_DEFINE_AUTOPTR_CLEANUP_FUNC diff --git a/libs/gst/controller/gstlfocontrolsource.h b/libs/gst/controller/gstlfocontrolsource.h index b192b5b3d..27d358d6a 100644 --- a/libs/gst/controller/gstlfocontrolsource.h +++ b/libs/gst/controller/gstlfocontrolsource.h @@ -87,10 +87,12 @@ struct _GstLFOControlSourceClass { gpointer _gst_reserved[GST_PADDING]; }; +GST_EXPORT GType gst_lfo_control_source_get_type (void); /* Functions */ +GST_EXPORT GstControlSource *gst_lfo_control_source_new (void); #ifdef G_DEFINE_AUTOPTR_CLEANUP_FUNC diff --git a/libs/gst/controller/gstproxycontrolbinding.h b/libs/gst/controller/gstproxycontrolbinding.h index 096712d9d..b5b49f612 100644 --- a/libs/gst/controller/gstproxycontrolbinding.h +++ b/libs/gst/controller/gstproxycontrolbinding.h @@ -25,7 +25,6 @@ G_BEGIN_DECLS -GType gst_proxy_control_binding_get_type (void); #define GST_TYPE_PROXY_CONTROL_BINDING (gst_proxy_control_binding_get_type()) #define GST_PROXY_CONTROL_BINDING(obj) \ (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_PROXY_CONTROL_BINDING,GstProxyControlBinding)) @@ -70,10 +69,14 @@ struct _GstProxyControlBindingClass gpointer _padding[GST_PADDING]; }; -GstControlBinding * gst_proxy_control_binding_new (GstObject * object, - const gchar * property_name, - GstObject * ref_object, - const gchar * ref_property_name); +GST_EXPORT +GType gst_proxy_control_binding_get_type (void); + +GST_EXPORT +GstControlBinding * gst_proxy_control_binding_new (GstObject * object, + const gchar * property_name, + GstObject * ref_object, + const gchar * ref_property_name); #ifdef G_DEFINE_AUTOPTR_CLEANUP_FUNC G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstProxyControlBinding, gst_object_unref) diff --git a/libs/gst/controller/gsttimedvaluecontrolsource.h b/libs/gst/controller/gsttimedvaluecontrolsource.h index 281484fd5..04d94ac85 100644 --- a/libs/gst/controller/gsttimedvaluecontrolsource.h +++ b/libs/gst/controller/gsttimedvaluecontrolsource.h @@ -81,6 +81,7 @@ struct _GstControlPoint } cache; }; +GST_EXPORT GType gst_control_point_get_type (void); /** @@ -115,24 +116,36 @@ struct _GstTimedValueControlSourceClass { #define GST_TIMED_VALUE_CONTROL_SOURCE_UNLOCK(o) \ g_mutex_unlock(&((GstTimedValueControlSource *)o)->lock) -GType gst_timed_value_control_source_get_type (void); +GST_EXPORT +GType gst_timed_value_control_source_get_type (void); /* Functions */ +GST_EXPORT GSequenceIter * gst_timed_value_control_source_find_control_point_iter ( GstTimedValueControlSource * self, GstClockTime timestamp); - +GST_EXPORT gboolean gst_timed_value_control_source_set (GstTimedValueControlSource * self, GstClockTime timestamp, const gdouble value); +GST_EXPORT gboolean gst_timed_value_control_source_set_from_list (GstTimedValueControlSource * self, const GSList * timedvalues); +GST_EXPORT gboolean gst_timed_value_control_source_unset (GstTimedValueControlSource * self, GstClockTime timestamp); + +GST_EXPORT void gst_timed_value_control_source_unset_all (GstTimedValueControlSource *self); + +GST_EXPORT GList * gst_timed_value_control_source_get_all (GstTimedValueControlSource * self); + +GST_EXPORT gint gst_timed_value_control_source_get_count (GstTimedValueControlSource * self); + +GST_EXPORT void gst_timed_value_control_invalidate_cache (GstTimedValueControlSource * self); #ifdef G_DEFINE_AUTOPTR_CLEANUP_FUNC diff --git a/libs/gst/controller/gsttriggercontrolsource.h b/libs/gst/controller/gsttriggercontrolsource.h index 2e9f21c02..dde3df18c 100644 --- a/libs/gst/controller/gsttriggercontrolsource.h +++ b/libs/gst/controller/gsttriggercontrolsource.h @@ -72,10 +72,12 @@ struct _GstTriggerControlSourceClass { gpointer _gst_reserved[GST_PADDING]; }; +GST_EXPORT GType gst_trigger_control_source_get_type (void); /* Functions */ +GST_EXPORT GstControlSource *gst_trigger_control_source_new (void); #ifdef G_DEFINE_AUTOPTR_CLEANUP_FUNC -- cgit v1.2.3