summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
m---------common0
-rw-r--r--gst-libs/gst/interfaces/Makefile.am4
-rwxr-xr-xgst-libs/gst/interfaces/build_mkenum.py4
-rw-r--r--gst-libs/gst/interfaces/meson.build2
-rw-r--r--gst-libs/gst/interfaces/photography-prelude.h31
-rw-r--r--gst-libs/gst/interfaces/photography.h61
6 files changed, 68 insertions, 34 deletions
diff --git a/common b/common
-Subproject 3fa2c9e372bceec30be91e67fb02b6cb05bed49
+Subproject f0c2dc9aadfa05bb5274c40da750104ecbb88cb
diff --git a/gst-libs/gst/interfaces/Makefile.am b/gst-libs/gst/interfaces/Makefile.am
index 966ee1b86..de9d2a664 100644
--- a/gst-libs/gst/interfaces/Makefile.am
+++ b/gst-libs/gst/interfaces/Makefile.am
@@ -10,7 +10,8 @@ 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
+glib_gen_decl_banner=GST_PHOTOGRAPHY_API
+glib_gen_decl_include=\#include <gst/interfaces/photography-prelude.h>
built_sources = \
photography-enumtypes.c
@@ -19,6 +20,7 @@ built_headers = \
photography-enumtypes.h
libgstphotographyinclude_HEADERS = \
+ photography-prelude.h \
$(headers_photography)
nodist_libgstphotographyinclude_HEADERS = \
diff --git a/gst-libs/gst/interfaces/build_mkenum.py b/gst-libs/gst/interfaces/build_mkenum.py
index 350cbb6de..a7883928e 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 <gst/gst.h>\n\nG_BEGIN_DECLS\n",
+ "#ifndef __GST_PHOTO_ENUM_TYPES_H__\n#define __GST_PHOTO_ENUM_TYPES_H__\n\n#include <gst/gst.h>\n#include <gst/interfaces/photography-prelude.h>\nG_BEGIN_DECLS\n",
'--fprod',
"\n/* enumerations from \"@filename@\" */\n",
'--vhead',
- "GST_EXPORT GType @enum_name@_get_type (void);\n#define GST_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n",
+ "GST_PHOTOGRAPHY_API 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/meson.build b/gst-libs/gst/interfaces/meson.build
index 23c984602..35290f731 100644
--- a/gst-libs/gst/interfaces/meson.build
+++ b/gst-libs/gst/interfaces/meson.build
@@ -1,5 +1,5 @@
photography_sources = ['photography.c']
-photo_headers = ['photography.h']
+photo_headers = ['photography.h', 'photography-prelude.h']
install_headers(photo_headers, subdir : 'gstreamer-1.0/gst/interfaces')
mkenums = find_program('build_mkenum.py')
diff --git a/gst-libs/gst/interfaces/photography-prelude.h b/gst-libs/gst/interfaces/photography-prelude.h
new file mode 100644
index 000000000..7e300e60a
--- /dev/null
+++ b/gst-libs/gst/interfaces/photography-prelude.h
@@ -0,0 +1,31 @@
+/* GStreamer Photography Library
+ * Copyright (C) 2018 GStreamer developers
+ *
+ * photography-prelude.h: prelude include header for gst-photography library
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef __GST_PHOTOGRAPHY_PRELUDE_H__
+#define __GST_PHOTOGRAPHY_PRELUDE_H__
+
+#include <gst/gst.h>
+
+#ifndef GST_PHOTOGRAPHY_API
+#define GST_PHOTOGRAPHY_API GST_EXPORT
+#endif
+
+#endif /* __GST_PHOTOGRAPHY_PRELUDE_H__ */
diff --git a/gst-libs/gst/interfaces/photography.h b/gst-libs/gst/interfaces/photography.h
index 089c0f178..0475d71aa 100644
--- a/gst-libs/gst/interfaces/photography.h
+++ b/gst-libs/gst/interfaces/photography.h
@@ -29,6 +29,7 @@
#endif
#include <gst/gst.h>
+#include <gst/interfaces/photography-prelude.h>
#include <gst/interfaces/photography-enumtypes.h>
G_BEGIN_DECLS
@@ -550,121 +551,121 @@ typedef struct _GstPhotographyInterface
gpointer _gst_reserved[GST_PADDING];
} GstPhotographyInterface;
-GST_EXPORT
+GST_PHOTOGRAPHY_API
GType gst_photography_get_type (void);
/* virtual class function wrappers */
-GST_EXPORT
+GST_PHOTOGRAPHY_API
gboolean gst_photography_get_ev_compensation (GstPhotography * photo,
gfloat * ev_comp);
-GST_EXPORT
+GST_PHOTOGRAPHY_API
gboolean gst_photography_get_iso_speed (GstPhotography * photo,
guint * iso_speed);
-GST_EXPORT
+GST_PHOTOGRAPHY_API
gboolean gst_photography_get_aperture (GstPhotography * photo,
guint * aperture);
-GST_EXPORT
+GST_PHOTOGRAPHY_API
gboolean gst_photography_get_exposure (GstPhotography * photo,
guint32 * exposure);
-GST_EXPORT
+GST_PHOTOGRAPHY_API
gboolean gst_photography_get_white_balance_mode (GstPhotography * photo,
GstPhotographyWhiteBalanceMode * wb_mode);
-GST_EXPORT
+GST_PHOTOGRAPHY_API
gboolean gst_photography_get_color_tone_mode (GstPhotography * photo,
GstPhotographyColorToneMode * tone_mode);
-GST_EXPORT
+GST_PHOTOGRAPHY_API
gboolean gst_photography_get_scene_mode (GstPhotography * photo,
GstPhotographySceneMode * scene_mode);
-GST_EXPORT
+GST_PHOTOGRAPHY_API
gboolean gst_photography_get_flash_mode (GstPhotography * photo,
GstPhotographyFlashMode * flash_mode);
-GST_EXPORT
+GST_PHOTOGRAPHY_API
gboolean gst_photography_get_noise_reduction (GstPhotography * photo,
GstPhotographyNoiseReduction * noise_reduction);
-GST_EXPORT
+GST_PHOTOGRAPHY_API
gboolean gst_photography_get_zoom (GstPhotography * photo, gfloat * zoom);
-GST_EXPORT
+GST_PHOTOGRAPHY_API
gboolean gst_photography_get_flicker_mode (GstPhotography * photo,
GstPhotographyFlickerReductionMode * mode);
-GST_EXPORT
+GST_PHOTOGRAPHY_API
gboolean gst_photography_get_focus_mode (GstPhotography * photo,
GstPhotographyFocusMode * mode);
-GST_EXPORT
+GST_PHOTOGRAPHY_API
gboolean gst_photography_set_ev_compensation (GstPhotography * photo,
gfloat ev_comp);
-GST_EXPORT
+GST_PHOTOGRAPHY_API
gboolean gst_photography_set_iso_speed (GstPhotography * photo,
guint iso_speed);
-GST_EXPORT
+GST_PHOTOGRAPHY_API
gboolean gst_photography_set_aperture (GstPhotography * photo, guint aperture);
-GST_EXPORT
+GST_PHOTOGRAPHY_API
gboolean gst_photography_set_exposure (GstPhotography * photo, guint exposure);
-GST_EXPORT
+GST_PHOTOGRAPHY_API
gboolean gst_photography_set_white_balance_mode (GstPhotography * photo,
GstPhotographyWhiteBalanceMode wb_mode);
-GST_EXPORT
+GST_PHOTOGRAPHY_API
gboolean gst_photography_set_color_tone_mode (GstPhotography * photo,
GstPhotographyColorToneMode tone_mode);
-GST_EXPORT
+GST_PHOTOGRAPHY_API
gboolean gst_photography_set_scene_mode (GstPhotography * photo,
GstPhotographySceneMode scene_mode);
-GST_EXPORT
+GST_PHOTOGRAPHY_API
gboolean gst_photography_set_flash_mode (GstPhotography * photo,
GstPhotographyFlashMode flash_mode);
-GST_EXPORT
+GST_PHOTOGRAPHY_API
gboolean gst_photography_set_noise_reduction (GstPhotography * photo,
GstPhotographyNoiseReduction noise_reduction);
-GST_EXPORT
+GST_PHOTOGRAPHY_API
gboolean gst_photography_set_zoom (GstPhotography * photo, gfloat zoom);
-GST_EXPORT
+GST_PHOTOGRAPHY_API
gboolean gst_photography_set_flicker_mode (GstPhotography * photo,
GstPhotographyFlickerReductionMode mode);
-GST_EXPORT
+GST_PHOTOGRAPHY_API
gboolean gst_photography_set_focus_mode (GstPhotography * photo,
GstPhotographyFocusMode mode);
-GST_EXPORT
+GST_PHOTOGRAPHY_API
GstPhotographyCaps gst_photography_get_capabilities (GstPhotography * photo);
-GST_EXPORT
+GST_PHOTOGRAPHY_API
gboolean gst_photography_prepare_for_capture (GstPhotography * photo,
GstPhotographyCapturePrepared func,
GstCaps *capture_caps,
gpointer user_data);
-GST_EXPORT
+GST_PHOTOGRAPHY_API
gboolean gst_photography_set_config (GstPhotography * photo,
GstPhotographySettings * config);
-GST_EXPORT
+GST_PHOTOGRAPHY_API
gboolean gst_photography_get_config (GstPhotography * photo,
GstPhotographySettings * config);
-GST_EXPORT
+GST_PHOTOGRAPHY_API
void gst_photography_set_autofocus (GstPhotography * photo, gboolean on);
G_END_DECLS
View Lorry Controller Status