From 8de28a4226ca11c50967686d5f3dd94cabe8be4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Tue, 18 Jul 2017 00:49:41 +0100 Subject: [PATCH] photography: mark symbols explicitly for export with GST_EXPORT --- common | 2 +- gst-libs/gst/interfaces/Makefile.am | 1 + gst-libs/gst/interfaces/build_mkenum.py | 4 ++-- gst-libs/gst/interfaces/photography.h | 31 +++++++++++++++++++++++++ 4 files changed, 35 insertions(+), 3 deletions(-) diff --git a/common b/common index 48a5d85ebf..29046b89d8 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 48a5d85ebf4a0bad1c997c83100f710fe2154fbf +Subproject commit 29046b89d80bbca22eb222c18820fb40a4ac5bde diff --git a/gst-libs/gst/interfaces/Makefile.am b/gst-libs/gst/interfaces/Makefile.am index e66ab826f4..966ee1b869 100644 --- a/gst-libs/gst/interfaces/Makefile.am +++ b/gst-libs/gst/interfaces/Makefile.am @@ -10,6 +10,7 @@ glib_enum_headers=$(headers_photography) glib_enum_define=GST_PHOTOGRAPHY glib_gen_prefix=gst_photography glib_gen_basename=photography +glib_gen_decl_banner=GST_EXPORT built_sources = \ photography-enumtypes.c diff --git a/gst-libs/gst/interfaces/build_mkenum.py b/gst-libs/gst/interfaces/build_mkenum.py index cbbf06a567..350cbb6def 100755 --- a/gst-libs/gst/interfaces/build_mkenum.py +++ b/gst-libs/gst/interfaces/build_mkenum.py @@ -8,11 +8,11 @@ import sys, os, shutil, subprocess h_array = ['--fhead', - "#ifndef __GST_PHOTO_ENUM_TYPES_H__\n#define __GST_PHOTO_ENUM_TYPES_H__\n\n#include \n\nG_BEGIN_DECLS\n", + "#ifndef __GST_PHOTO_ENUM_TYPES_H__\n#define __GST_PHOTO_ENUM_TYPES_H__\n\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 GType @enum_name@_get_type (void);\n#define GST_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n", '--ftail', "G_END_DECLS\n\n#endif /* __GST_PHOTO_ENUM_TYPES_H__ */"] diff --git a/gst-libs/gst/interfaces/photography.h b/gst-libs/gst/interfaces/photography.h index f2c7216b39..089c0f1787 100644 --- a/gst-libs/gst/interfaces/photography.h +++ b/gst-libs/gst/interfaces/photography.h @@ -550,90 +550,121 @@ typedef struct _GstPhotographyInterface gpointer _gst_reserved[GST_PADDING]; } GstPhotographyInterface; +GST_EXPORT GType gst_photography_get_type (void); /* virtual class function wrappers */ + +GST_EXPORT gboolean gst_photography_get_ev_compensation (GstPhotography * photo, gfloat * ev_comp); +GST_EXPORT gboolean gst_photography_get_iso_speed (GstPhotography * photo, guint * iso_speed); +GST_EXPORT gboolean gst_photography_get_aperture (GstPhotography * photo, guint * aperture); +GST_EXPORT gboolean gst_photography_get_exposure (GstPhotography * photo, guint32 * exposure); +GST_EXPORT gboolean gst_photography_get_white_balance_mode (GstPhotography * photo, GstPhotographyWhiteBalanceMode * wb_mode); +GST_EXPORT gboolean gst_photography_get_color_tone_mode (GstPhotography * photo, GstPhotographyColorToneMode * tone_mode); +GST_EXPORT gboolean gst_photography_get_scene_mode (GstPhotography * photo, GstPhotographySceneMode * scene_mode); +GST_EXPORT gboolean gst_photography_get_flash_mode (GstPhotography * photo, GstPhotographyFlashMode * flash_mode); +GST_EXPORT gboolean gst_photography_get_noise_reduction (GstPhotography * photo, GstPhotographyNoiseReduction * noise_reduction); +GST_EXPORT gboolean gst_photography_get_zoom (GstPhotography * photo, gfloat * zoom); +GST_EXPORT gboolean gst_photography_get_flicker_mode (GstPhotography * photo, GstPhotographyFlickerReductionMode * mode); +GST_EXPORT gboolean gst_photography_get_focus_mode (GstPhotography * photo, GstPhotographyFocusMode * mode); +GST_EXPORT gboolean gst_photography_set_ev_compensation (GstPhotography * photo, gfloat ev_comp); +GST_EXPORT gboolean gst_photography_set_iso_speed (GstPhotography * photo, guint iso_speed); +GST_EXPORT gboolean gst_photography_set_aperture (GstPhotography * photo, guint aperture); +GST_EXPORT gboolean gst_photography_set_exposure (GstPhotography * photo, guint exposure); +GST_EXPORT gboolean gst_photography_set_white_balance_mode (GstPhotography * photo, GstPhotographyWhiteBalanceMode wb_mode); +GST_EXPORT gboolean gst_photography_set_color_tone_mode (GstPhotography * photo, GstPhotographyColorToneMode tone_mode); +GST_EXPORT gboolean gst_photography_set_scene_mode (GstPhotography * photo, GstPhotographySceneMode scene_mode); +GST_EXPORT gboolean gst_photography_set_flash_mode (GstPhotography * photo, GstPhotographyFlashMode flash_mode); +GST_EXPORT gboolean gst_photography_set_noise_reduction (GstPhotography * photo, GstPhotographyNoiseReduction noise_reduction); +GST_EXPORT gboolean gst_photography_set_zoom (GstPhotography * photo, gfloat zoom); +GST_EXPORT gboolean gst_photography_set_flicker_mode (GstPhotography * photo, GstPhotographyFlickerReductionMode mode); +GST_EXPORT gboolean gst_photography_set_focus_mode (GstPhotography * photo, GstPhotographyFocusMode mode); +GST_EXPORT GstPhotographyCaps gst_photography_get_capabilities (GstPhotography * photo); +GST_EXPORT gboolean gst_photography_prepare_for_capture (GstPhotography * photo, GstPhotographyCapturePrepared func, GstCaps *capture_caps, gpointer user_data); +GST_EXPORT gboolean gst_photography_set_config (GstPhotography * photo, GstPhotographySettings * config); +GST_EXPORT gboolean gst_photography_get_config (GstPhotography * photo, GstPhotographySettings * config); +GST_EXPORT void gst_photography_set_autofocus (GstPhotography * photo, gboolean on); G_END_DECLS