validate: GST_EXPORT -> GST_VALIDATE_API

We need different export decorators for the different libs.
For now no actual change though, just rename before the release,
and add prelude headers to define the new decorator to GST_EXPORT.

diff --git a/validate/docs/validate/meson.build b/validate/docs/validate/meson.build
index 871a556..451bec6 100644 (file)
--- a/validate/docs/validate/meson.build
+++ b/validate/docs/validate/meson.build
@@ -21,7 +21,7 @@ if gtkdoc.found()
     main_sgml : 'gst-validate-docs.sgml',
     src_dir : '@0@/../../gst/validate'.format(meson.current_source_dir()),
     scan_args : ['--deprecated-guards=GST_DISABLE_DEPRECATED',
-                '--ignore-decorators=GST_EXPORT',
+                '--ignore-decorators=GST_VALIDATE_API',
                 '--ignore-headers=gettext.h gst-validate-internal.h gst-validate-monitor.h gst-validate-bin-monitor.h gst-validate-element-monitor.h gst-validate-pad-monitor.h gst-validate-override.h gst-validate-override-registry.h gst-validate-utils.h gst-validate-media-info.h  gst-validate-report.h  media-descriptor.h media-descriptor-parser.h media-descriptor-writer.h gst-validate-i18n-lib.h'
             ],
     scanobjs_args : ['--type-init-func="gst_init(NULL,NULL)"'],

diff --git a/validate/gst/validate/Makefile.am b/validate/gst/validate/Makefile.am
index 98332bb..342730a 100644 (file)
--- a/validate/gst/validate/Makefile.am
+++ b/validate/gst/validate/Makefile.am
@@ -23,6 +23,7 @@ source_c = \
 
 source_h = \
        validate.h \
+       validate-prelude.h \
        gst-validate-types.h \
        gst-validate-bin-monitor.h \
        gst-validate-pipeline-monitor.h \

diff --git a/validate/gst/validate/gst-validate-bin-monitor.h b/validate/gst/validate/gst-validate-bin-monitor.h
index df5b022..585861c 100644 (file)
--- a/validate/gst/validate/gst-validate-bin-monitor.h
+++ b/validate/gst/validate/gst-validate-bin-monitor.h
@@ -73,10 +73,10 @@ struct _GstValidateBinMonitorClass {
 };
 
 /* normal GObject stuff */
-GST_EXPORT
+GST_VALIDATE_API
 GType          gst_validate_bin_monitor_get_type               (void);
 
-GST_EXPORT
+GST_VALIDATE_API
 GstValidateBinMonitor *   gst_validate_bin_monitor_new      (GstBin * bin, GstValidateRunner * runner, GstValidateMonitor * parent);
 
 G_END_DECLS

diff --git a/validate/gst/validate/gst-validate-element-monitor.h b/validate/gst/validate/gst-validate-element-monitor.h
index e45941a..9a80d2a 100644 (file)
--- a/validate/gst/validate/gst-validate-element-monitor.h
+++ b/validate/gst/validate/gst-validate-element-monitor.h
@@ -77,10 +77,10 @@ struct _GstValidateElementMonitorClass {
 };
 
 /* normal GObject stuff */
-GST_EXPORT
+GST_VALIDATE_API
 GType          gst_validate_element_monitor_get_type           (void);
 
-GST_EXPORT
+GST_VALIDATE_API
 GstValidateElementMonitor *   gst_validate_element_monitor_new      (GstElement * element, GstValidateRunner * runner, GstValidateMonitor * parent);
 
 G_END_DECLS

diff --git a/validate/gst/validate/gst-validate-enum-types.h.template b/validate/gst/validate/gst-validate-enum-types.h.template
index d0131ad..f28a284 100644 (file)
--- a/validate/gst/validate/gst-validate-enum-types.h.template
+++ b/validate/gst/validate/gst-validate-enum-types.h.template
@@ -14,7 +14,7 @@ G_BEGIN_DECLS
 /*** END file-production ***/
 
 /*** BEGIN value-header ***/
-GST_EXPORT GType @enum_name@_get_type (void);
+GST_VALIDATE_API GType @enum_name@_get_type (void);
 #define @ENUMPREFIX@_TYPE_@ENUMSHORT@ (@enum_name@_get_type ())
 /*** END value-header ***/
 

diff --git a/validate/gst/validate/gst-validate-media-info.h b/validate/gst/validate/gst-validate-media-info.h
index aaa4e2d..9df9bf1 100644 (file)
--- a/validate/gst/validate/gst-validate-media-info.h
+++ b/validate/gst/validate/gst-validate-media-info.h
@@ -24,6 +24,7 @@
 
 #include <gst/gst.h>
 #include <gst/pbutils/pbutils.h>
+#include <gst/validate/validate-prelude.h>
 
 G_BEGIN_DECLS
 
@@ -61,25 +62,25 @@ struct _GstValidateMediaInfo {
   GstValidateStreamInfo *stream_info;
 };
 
-GST_EXPORT
+GST_VALIDATE_API
 void gst_validate_media_info_init (GstValidateMediaInfo * mi);
-GST_EXPORT
+GST_VALIDATE_API
 void gst_validate_media_info_clear (GstValidateMediaInfo * mi);
-GST_EXPORT
+GST_VALIDATE_API
 void gst_validate_media_info_free (GstValidateMediaInfo * mi);
 
-GST_EXPORT
+GST_VALIDATE_API
 gchar * gst_validate_media_info_to_string (GstValidateMediaInfo * mi, gsize * length);
-GST_EXPORT
+GST_VALIDATE_API
 gboolean gst_validate_media_info_save (GstValidateMediaInfo * mi, const gchar * path, GError ** err);
-GST_EXPORT
+GST_VALIDATE_API
 GstValidateMediaInfo * gst_validate_media_info_load (const gchar * path, GError ** err);
 
-GST_EXPORT
+GST_VALIDATE_API
 gboolean gst_validate_media_info_inspect_uri (GstValidateMediaInfo * mi, const gchar * uri,
         gboolean discover_only, GError ** err);
 
-GST_EXPORT
+GST_VALIDATE_API
 gboolean gst_validate_media_info_compare (GstValidateMediaInfo * expected, GstValidateMediaInfo * extracted);
 
 G_END_DECLS

diff --git a/validate/gst/validate/gst-validate-monitor-factory.h b/validate/gst/validate/gst-validate-monitor-factory.h
index e47db86..24fe9cb 100644 (file)
--- a/validate/gst/validate/gst-validate-monitor-factory.h
+++ b/validate/gst/validate/gst-validate-monitor-factory.h
@@ -30,7 +30,7 @@
 
 G_BEGIN_DECLS
 
-GST_EXPORT
+GST_VALIDATE_API
 GstValidateMonitor *       gst_validate_monitor_factory_create (GstObject * target, GstValidateRunner * runner, GstValidateMonitor * parent);
 
 G_END_DECLS

diff --git a/validate/gst/validate/gst-validate-monitor.h b/validate/gst/validate/gst-validate-monitor.h
index 51a2d29..7206fcb 100644 (file)
--- a/validate/gst/validate/gst-validate-monitor.h
+++ b/validate/gst/validate/gst-validate-monitor.h
@@ -116,23 +116,23 @@ struct _GstValidateMonitorClass {
 };
 
 /* normal GObject stuff */
-GST_EXPORT
+GST_VALIDATE_API
 GType          gst_validate_monitor_get_type           (void);
 
-GST_EXPORT
+GST_VALIDATE_API
 void            gst_validate_monitor_attach_override  (GstValidateMonitor * monitor,
                                                  GstValidateOverride * override);
 
-GST_EXPORT
+GST_VALIDATE_API
 GstElement *    gst_validate_monitor_get_element (GstValidateMonitor * monitor);
-GST_EXPORT
+GST_VALIDATE_API
 gchar *   gst_validate_monitor_get_element_name (GstValidateMonitor * monitor);
-GST_EXPORT
+GST_VALIDATE_API
 void gst_validate_monitor_set_media_descriptor (GstValidateMonitor * monitor,
                                                 GstValidateMediaDescriptor *media_descriptor);
-GST_EXPORT
+GST_VALIDATE_API
 GstPipeline * gst_validate_monitor_get_pipeline (GstValidateMonitor * monitor);
-GST_EXPORT
+GST_VALIDATE_API
 GstObject * gst_validate_monitor_get_target (GstValidateMonitor * monitor);
 G_END_DECLS
 

diff --git a/validate/gst/validate/gst-validate-override-registry.h b/validate/gst/validate/gst-validate-override-registry.h
index f7d9bf5..1107c17 100644 (file)
--- a/validate/gst/validate/gst-validate-override-registry.h
+++ b/validate/gst/validate/gst-validate-override-registry.h
@@ -39,23 +39,23 @@ typedef struct {
   GQueue klass_overrides;
 } GstValidateOverrideRegistry;
 
-GST_EXPORT
+GST_VALIDATE_API
 GstValidateOverrideRegistry * gst_validate_override_registry_get (void);
 
-GST_EXPORT GList *
+GST_VALIDATE_API GList *
 gst_validate_override_registry_get_override_for_names (GstValidateOverrideRegistry *reg,
         const gchar *name, ...);
-GST_EXPORT
+GST_VALIDATE_API
 void gst_validate_override_register_by_name (const gchar * name, GstValidateOverride * override);
-GST_EXPORT
+GST_VALIDATE_API
 void gst_validate_override_register_by_type (GType gtype, GstValidateOverride * override);
-GST_EXPORT
+GST_VALIDATE_API
 void gst_validate_override_register_by_klass (const gchar * klass, GstValidateOverride * override);
 
-GST_EXPORT
+GST_VALIDATE_API
 void gst_validate_override_registry_attach_overrides (GstValidateMonitor * monitor);
 
-GST_EXPORT
+GST_VALIDATE_API
 int gst_validate_override_registry_preload (void);
 
 G_END_DECLS

diff --git a/validate/gst/validate/gst-validate-override.h b/validate/gst/validate/gst-validate-override.h
index 3dae4a7..5263b35 100644 (file)
--- a/validate/gst/validate/gst-validate-override.h
+++ b/validate/gst/validate/gst-validate-override.h
@@ -74,7 +74,7 @@ struct _GstValidateOverride
   GstValidateOverridePriv *priv;
 };
 
-GST_EXPORT
+GST_VALIDATE_API
 GType gst_validate_override_get_type (void) G_GNUC_CONST;
 
 /* TYPE MACROS */
@@ -85,46 +85,46 @@ GType gst_validate_override_get_type (void) G_GNUC_CONST;
 #define GST_IS_VALIDATE_OVERRIDE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_VALIDATE_OVERRIDE))
 #define GST_VALIDATE_OVERRIDE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_VALIDATE_OVERRIDE, GstValidateOverrideClass))
 
-GST_EXPORT
+GST_VALIDATE_API
 GstValidateOverride *    gst_validate_override_new (void);
 
 void               gst_validate_override_free (GstValidateOverride * override);
-GST_EXPORT
+GST_VALIDATE_API
 void               gst_validate_override_change_severity (GstValidateOverride * override, GstValidateIssueId issue_id, GstValidateReportLevel new_level);
-GST_EXPORT
+GST_VALIDATE_API
 GstValidateReportLevel   gst_validate_override_get_severity (GstValidateOverride * override, GstValidateIssueId issue_id, GstValidateReportLevel default_level);
 
-GST_EXPORT
+GST_VALIDATE_API
 void               gst_validate_override_event_handler (GstValidateOverride * override, GstValidateMonitor * monitor, GstEvent * event);
-GST_EXPORT
+GST_VALIDATE_API
 void               gst_validate_override_buffer_handler (GstValidateOverride * override, GstValidateMonitor * monitor, GstBuffer * buffer);
-GST_EXPORT
+GST_VALIDATE_API
 void               gst_validate_override_query_handler (GstValidateOverride * override, GstValidateMonitor * monitor, GstQuery * query);
-GST_EXPORT
+GST_VALIDATE_API
 void               gst_validate_override_buffer_probe_handler (GstValidateOverride * override, GstValidateMonitor * monitor, GstBuffer * buffer);
-GST_EXPORT
+GST_VALIDATE_API
 void               gst_validate_override_getcaps_handler (GstValidateOverride * override, GstValidateMonitor * monitor, GstCaps * caps);
-GST_EXPORT
+GST_VALIDATE_API
 void               gst_validate_override_setcaps_handler (GstValidateOverride * override, GstValidateMonitor * monitor, GstCaps * caps);
 
-GST_EXPORT
+GST_VALIDATE_API
 void               gst_validate_override_set_event_handler (GstValidateOverride * override, GstValidateOverrideEventHandler handler);
-GST_EXPORT
+GST_VALIDATE_API
 void               gst_validate_override_set_buffer_handler (GstValidateOverride * override, GstValidateOverrideBufferHandler handler);
-GST_EXPORT
+GST_VALIDATE_API
 void               gst_validate_override_set_query_handler (GstValidateOverride * override, GstValidateOverrideQueryHandler handler);
-GST_EXPORT
+GST_VALIDATE_API
 void               gst_validate_override_set_buffer_probe_handler (GstValidateOverride * override, GstValidateOverrideBufferHandler handler);
-GST_EXPORT
+GST_VALIDATE_API
 void               gst_validate_override_set_getcaps_handler (GstValidateOverride * override, GstValidateOverrideGetCapsHandler handler);
-GST_EXPORT
+GST_VALIDATE_API
 void               gst_validate_override_set_setcaps_handler (GstValidateOverride * override, GstValidateOverrideSetCapsHandler handler);
-GST_EXPORT
+GST_VALIDATE_API
 void               gst_validate_override_element_added_handler (GstValidateOverride * override, GstValidateMonitor * monitor, GstElement * child);
-GST_EXPORT
+GST_VALIDATE_API
 void               gst_validate_override_set_element_added_handler (GstValidateOverride * override, GstValidateOverrideElementAddedHandler func);
 
-GST_EXPORT
+GST_VALIDATE_API
 gboolean           gst_validate_override_can_attach (GstValidateOverride * override, GstValidateMonitor *monitor);
 
 G_END_DECLS

diff --git a/validate/gst/validate/gst-validate-pad-monitor.h b/validate/gst/validate/gst-validate-pad-monitor.h
index f5589c7..73879e0 100644 (file)
--- a/validate/gst/validate/gst-validate-pad-monitor.h
+++ b/validate/gst/validate/gst-validate-pad-monitor.h
@@ -138,10 +138,10 @@ struct _GstValidatePadMonitorClass {
 };
 
 /* normal GObject stuff */
-GST_EXPORT
+GST_VALIDATE_API
 GType          gst_validate_pad_monitor_get_type               (void);
 
-GST_EXPORT
+GST_VALIDATE_API
 GstValidatePadMonitor *   gst_validate_pad_monitor_new      (GstPad * pad, GstValidateRunner * runner, GstValidateElementMonitor *element_monitor);
 
 G_END_DECLS

diff --git a/validate/gst/validate/gst-validate-pipeline-monitor.h b/validate/gst/validate/gst-validate-pipeline-monitor.h
index a20207c..666fa53 100644 (file)
--- a/validate/gst/validate/gst-validate-pipeline-monitor.h
+++ b/validate/gst/validate/gst-validate-pipeline-monitor.h
@@ -83,10 +83,10 @@ struct _GstValidatePipelineMonitorClass {
 };
 
 /* normal GObject stuff */
-GST_EXPORT
+GST_VALIDATE_API
 GType          gst_validate_pipeline_monitor_get_type          (void);
 
-GST_EXPORT
+GST_VALIDATE_API
 GstValidatePipelineMonitor *   gst_validate_pipeline_monitor_new      (GstPipeline * pipeline,
     GstValidateRunner * runner, GstValidateMonitor * parent);
 

diff --git a/validate/gst/validate/gst-validate-report.h b/validate/gst/validate/gst-validate-report.h
index 5001cbb..c701f3a 100644 (file)
--- a/validate/gst/validate/gst-validate-report.h
+++ b/validate/gst/validate/gst-validate-report.h
@@ -28,12 +28,13 @@ typedef struct _GstValidateReport GstValidateReport;
 typedef guintptr GstValidateIssueId;
 
 #include <gst/gst.h>
+#include <gst/validate/validate-prelude.h>
 #include <gst/validate/gst-validate-reporter.h>
 #include "gst-validate-types.h"
 
 G_BEGIN_DECLS
 
-GST_EXPORT
+GST_VALIDATE_API
 GType           gst_validate_report_get_type (void);
 #define GST_TYPE_VALIDATE_REPORT (gst_validate_report_get_type ())
 
@@ -150,7 +151,7 @@ typedef struct {
 
 } GstValidateIssue;
 
-GST_EXPORT
+GST_VALIDATE_API
 GType           gst_validate_issue_get_type (void);
 
 struct _GstValidateReport {
@@ -204,69 +205,69 @@ void gst_validate_report_add_message (GstValidateReport *report,
                                     gst_validate_reporter_get_name (r->reporter), \
                                     GST_VALIDATE_ISSUE_ARGS (r->issue), \
                                     r->message
-GST_EXPORT
+GST_VALIDATE_API
 void               gst_validate_report_init (void);
-GST_EXPORT
+GST_VALIDATE_API
 GstValidateIssue  *gst_validate_issue_from_id (GstValidateIssueId issue_id);
-GST_EXPORT
+GST_VALIDATE_API
 GstValidateIssueId gst_validate_issue_get_id (GstValidateIssue * issue);
-GST_EXPORT
+GST_VALIDATE_API
 void               gst_validate_issue_register (GstValidateIssue * issue);
-GST_EXPORT
+GST_VALIDATE_API
 GstValidateIssue  *gst_validate_issue_new (GstValidateIssueId issue_id, const gchar * summary,
                                           const gchar * description,
                                           GstValidateReportLevel default_level);
-GST_EXPORT
+GST_VALIDATE_API
 void gst_validate_issue_set_default_level (GstValidateIssue *issue,
                                            GstValidateReportLevel default_level);
 
-GST_EXPORT
+GST_VALIDATE_API
 GstValidateReport *gst_validate_report_new (GstValidateIssue * issue,
               GstValidateReporter * reporter,
               const gchar * message);
-GST_EXPORT
+GST_VALIDATE_API
 void               gst_validate_report_unref (GstValidateReport * report);
-GST_EXPORT
+GST_VALIDATE_API
 GstValidateReport *gst_validate_report_ref   (GstValidateReport * report);
 
-GST_EXPORT
+GST_VALIDATE_API
 GstValidateIssueId gst_validate_report_get_issue_id (GstValidateReport * report);
 
-GST_EXPORT
+GST_VALIDATE_API
 gboolean           gst_validate_report_check_abort (GstValidateReport * report);
-GST_EXPORT
+GST_VALIDATE_API
 void               gst_validate_report_printf (GstValidateReport * report);
-GST_EXPORT
+GST_VALIDATE_API
 void               gst_validate_report_print_level (GstValidateReport *report);
-GST_EXPORT
+GST_VALIDATE_API
 void               gst_validate_report_print_detected_on (GstValidateReport *report);
-GST_EXPORT
+GST_VALIDATE_API
 void               gst_validate_report_print_details (GstValidateReport *report);
-GST_EXPORT
+GST_VALIDATE_API
 void               gst_validate_report_print_description (GstValidateReport *report);
 
-GST_EXPORT
+GST_VALIDATE_API
 const gchar *      gst_validate_report_level_get_name (GstValidateReportLevel level);
 
-GST_EXPORT
+GST_VALIDATE_API
 void               gst_validate_printf        (gpointer source,
                                                const gchar      * format,
                                                ...) G_GNUC_PRINTF (2, 3) G_GNUC_NO_INSTRUMENT;
-GST_EXPORT
+GST_VALIDATE_API
 void               gst_validate_print_action  (GstValidateAction *action, const gchar * message);
-GST_EXPORT
+GST_VALIDATE_API
 void               gst_validate_printf_valist (gpointer source,
                                                const gchar      * format,
                                                va_list            args) G_GNUC_NO_INSTRUMENT;
-GST_EXPORT
+GST_VALIDATE_API
 gboolean gst_validate_report_should_print (GstValidateReport * report);
-GST_EXPORT
+GST_VALIDATE_API
 gboolean gst_validate_report_set_master_report(GstValidateReport *report, GstValidateReport *master_report);
-GST_EXPORT
+GST_VALIDATE_API
 void gst_validate_report_set_reporting_level (GstValidateReport *report, GstValidateReportingDetails level);
-GST_EXPORT
+GST_VALIDATE_API
 void gst_validate_report_add_repeated_report (GstValidateReport *report, GstValidateReport *repeated_report);
-GST_EXPORT
+GST_VALIDATE_API
 GstValidateReportLevel gst_validate_report_level_from_name (const gchar *level_name);
 
 G_END_DECLS

diff --git a/validate/gst/validate/gst-validate-reporter.h b/validate/gst/validate/gst-validate-reporter.h
index 71a452d..005f2a8 100644 (file)
--- a/validate/gst/validate/gst-validate-reporter.h
+++ b/validate/gst/validate/gst-validate-reporter.h
@@ -24,6 +24,7 @@ typedef struct _GstValidateReporter GstValidateReporter;
 typedef struct _GstValidateReporterInterface GstValidateReporterInterface;
 
 #include <glib-object.h>
+#include <gst/validate/validate-prelude.h>
 #include <gst/validate/gst-validate-report.h>
 #include <gst/validate/gst-validate-runner.h>
 #include <gst/validate/gst-validate-enums.h>
@@ -64,7 +65,7 @@ G_BEGIN_DECLS
   } G_STMT_END
 #endif /* G_HAVE_ISO_VARARGS */
 #endif /* G_HAVE_GNUC_VARARGS */
-GST_EXPORT
+GST_VALIDATE_API
 GType gst_validate_reporter_get_type (void);
 
 /**
@@ -95,42 +96,42 @@ struct _GstValidateReporterInterface
     GstPipeline *                 (*get_pipeline)        (GstValidateReporter *reporter);
 };
 
-GST_EXPORT
+GST_VALIDATE_API
 void gst_validate_reporter_set_name            (GstValidateReporter * reporter,
                                           gchar * name);
-GST_EXPORT
+GST_VALIDATE_API
 const gchar * gst_validate_reporter_get_name            (GstValidateReporter * reporter);
-GST_EXPORT
+GST_VALIDATE_API
 GstValidateRunner * gst_validate_reporter_get_runner (GstValidateReporter *reporter);
-GST_EXPORT
+GST_VALIDATE_API
 void gst_validate_reporter_init                (GstValidateReporter * reporter, const gchar *name);
-GST_EXPORT
+GST_VALIDATE_API
 void gst_validate_report                       (GstValidateReporter * reporter, GstValidateIssueId issue_id,
                                           const gchar * format, ...) G_GNUC_PRINTF (3, 4) G_GNUC_NO_INSTRUMENT;
-GST_EXPORT
+GST_VALIDATE_API
 void gst_validate_report_valist                (GstValidateReporter * reporter, GstValidateIssueId issue_id,
                                           const gchar * format, va_list var_args);
-GST_EXPORT void
+GST_VALIDATE_API void
 gst_validate_reporter_report_simple (GstValidateReporter * reporter, GstValidateIssueId issue_id,
                                           const gchar * message);
 
-GST_EXPORT
+GST_VALIDATE_API
 void gst_validate_reporter_set_runner          (GstValidateReporter * reporter, GstValidateRunner *runner);
-GST_EXPORT
+GST_VALIDATE_API
 void gst_validate_reporter_set_handle_g_logs   (GstValidateReporter * reporter);
-GST_EXPORT
+GST_VALIDATE_API
 GstValidateReport * gst_validate_reporter_get_report (GstValidateReporter *reporter,
                                                       GstValidateIssueId issue_id);
-GST_EXPORT
+GST_VALIDATE_API
 GList * gst_validate_reporter_get_reports (GstValidateReporter * reporter);
-GST_EXPORT
+GST_VALIDATE_API
 gint gst_validate_reporter_get_reports_count (GstValidateReporter *reporter);
-GST_EXPORT
+GST_VALIDATE_API
 GstValidateReportingDetails gst_validate_reporter_get_reporting_level (GstValidateReporter *reporter);
 
-GST_EXPORT
+GST_VALIDATE_API
 void gst_validate_reporter_purge_reports (GstValidateReporter * reporter);
-GST_EXPORT
+GST_VALIDATE_API
 GstPipeline * gst_validate_reporter_get_pipeline (GstValidateReporter * reporter);
 
 G_END_DECLS

diff --git a/validate/gst/validate/gst-validate-runner.h b/validate/gst/validate/gst-validate-runner.h
index 0223a43..619b3dd 100644 (file)
--- a/validate/gst/validate/gst-validate-runner.h
+++ b/validate/gst/validate/gst-validate-runner.h
@@ -71,28 +71,28 @@ struct _GstValidateRunnerClass {
 };
 
 /* normal GObject stuff */
-GST_EXPORT
+GST_VALIDATE_API
 GType          gst_validate_runner_get_type            (void);
 
-GST_EXPORT
+GST_VALIDATE_API
 GstValidateRunner *   gst_validate_runner_new               (void);
 
-GST_EXPORT
+GST_VALIDATE_API
 void            gst_validate_runner_add_report  (GstValidateRunner * runner, GstValidateReport * report);
 
-GST_EXPORT
+GST_VALIDATE_API
 guint           gst_validate_runner_get_reports_count (GstValidateRunner * runner);
-GST_EXPORT
+GST_VALIDATE_API
 GList *         gst_validate_runner_get_reports (GstValidateRunner * runner);
 
-GST_EXPORT
+GST_VALIDATE_API
 int             gst_validate_runner_printf (GstValidateRunner * runner);
-GST_EXPORT
+GST_VALIDATE_API
 int             gst_validate_runner_exit (GstValidateRunner * runner, gboolean print_result);
 
-GST_EXPORT
+GST_VALIDATE_API
 GstValidateReportingDetails gst_validate_runner_get_default_reporting_level (GstValidateRunner *runner);
-GST_EXPORT
+GST_VALIDATE_API
 GstValidateReportingDetails gst_validate_runner_get_reporting_level_for_name (GstValidateRunner *runner,
                                                                             const gchar *name);
 

diff --git a/validate/gst/validate/gst-validate-scenario.h b/validate/gst/validate/gst-validate-scenario.h
index 5dbf7b8..aa74c58 100644 (file)
--- a/validate/gst/validate/gst-validate-scenario.h
+++ b/validate/gst/validate/gst-validate-scenario.h
@@ -114,15 +114,15 @@ struct _GstValidateAction
   gpointer _gst_reserved[GST_PADDING_LARGE - 1]; /* ->priv */
 };
 
-GST_EXPORT
+GST_VALIDATE_API
 void                  gst_validate_action_set_done     (GstValidateAction *action);
-GST_EXPORT
+GST_VALIDATE_API
 GstValidateScenario * gst_validate_action_get_scenario (GstValidateAction *action);
 
 #define GST_TYPE_VALIDATE_ACTION            (gst_validate_action_get_type ())
 #define GST_IS_VALIDATE_ACTION(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_VALIDATE_ACTION))
 #define GST_VALIDATE_ACTION_GET_TYPE(obj)   ((GstValidateActionType*)gst_validate_get_action_type(((GstValidateAction*)obj)->type))
-GST_EXPORT
+GST_VALIDATE_API
 GType gst_validate_action_get_type (void);
 
 /**
@@ -195,10 +195,10 @@ struct _GstValidateActionType
 #define GST_TYPE_VALIDATE_ACTION_TYPE       (gst_validate_action_type_get_type ())
 #define GST_IS_VALIDATE_ACTION_TYPE(obj)    (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_VALIDATE_ACTION_TYPE))
 #define GST_VALIDATE_ACTION_TYPE(obj)       ((GstValidateActionType*) obj)
-GST_EXPORT
+GST_VALIDATE_API
 GType gst_validate_action_type_get_type     (void);
 
-GST_EXPORT
+GST_VALIDATE_API
 gboolean gst_validate_print_action_types (const gchar ** wanted_types, gint num_wanted_types);
 
 /**
@@ -256,22 +256,22 @@ struct _GstValidateScenario
   gpointer _gst_reserved[GST_PADDING + 1];
 };
 
-GST_EXPORT
+GST_VALIDATE_API
 GType gst_validate_scenario_get_type (void);
 
-GST_EXPORT
+GST_VALIDATE_API
 GstValidateScenario * gst_validate_scenario_factory_create (GstValidateRunner *runner,
                                                 GstElement *pipeline,
                                                 const gchar *scenario_name);
-GST_EXPORT gboolean
+GST_VALIDATE_API gboolean
 gst_validate_list_scenarios       (gchar **scenarios,
                                    gint num_scenarios,
                                    gchar * output_file);
 
-GST_EXPORT GstValidateActionType *
+GST_VALIDATE_API GstValidateActionType *
 gst_validate_get_action_type           (const gchar *type_name);
 
-GST_EXPORT GstValidateActionType *
+GST_VALIDATE_API GstValidateActionType *
 gst_validate_register_action_type      (const gchar *type_name,
                                         const gchar *implementer_namespace,
                                         GstValidateExecuteAction function,
@@ -279,7 +279,7 @@ gst_validate_register_action_type      (const gchar *type_name,
                                         const gchar *description,
                                         GstValidateActionTypeFlags flags);
 
-GST_EXPORT GstValidateActionType *
+GST_VALIDATE_API GstValidateActionType *
 gst_validate_register_action_type_dynamic (GstPlugin *plugin,
                                            const gchar * type_name,
                                            GstRank rank,
@@ -289,13 +289,13 @@ gst_validate_register_action_type_dynamic (GstPlugin *plugin,
                                            GstValidateActionTypeFlags flags);
 
 
-GST_EXPORT
+GST_VALIDATE_API
 gboolean gst_validate_action_get_clocktime (GstValidateScenario * scenario,
                                             GstValidateAction *action,
                                             const gchar * name,
                                             GstClockTime * retval);
 
-GST_EXPORT GstValidateExecuteActionReturn
+GST_VALIDATE_API GstValidateExecuteActionReturn
 gst_validate_scenario_execute_seek         (GstValidateScenario *scenario,
                                              GstValidateAction *action,
                                              gdouble rate,
@@ -306,19 +306,19 @@ gst_validate_scenario_execute_seek         (GstValidateScenario *scenario,
                                              GstSeekType stop_type,
                                              GstClockTime stop);
 
-GST_EXPORT GList *
+GST_VALIDATE_API GList *
 gst_validate_scenario_get_actions          (GstValidateScenario *scenario);
-GST_EXPORT GstValidateExecuteActionReturn
+GST_VALIDATE_API GstValidateExecuteActionReturn
 gst_validate_execute_action                 (GstValidateActionType * action_type,
                                              GstValidateAction * action);
 
-GST_EXPORT GstState
+GST_VALIDATE_API GstState
 gst_validate_scenario_get_target_state     (GstValidateScenario *scenario);
 
-GST_EXPORT GstElement *
+GST_VALIDATE_API GstElement *
 gst_validate_scenario_get_pipeline         (GstValidateScenario * scenario);
 
-GST_EXPORT
+GST_VALIDATE_API
 void gst_validate_scenario_deinit          (void);
 
 G_END_DECLS

diff --git a/validate/gst/validate/gst-validate-utils.h b/validate/gst/validate/gst-validate-utils.h
index f41f028..16d92e5 100644 (file)
--- a/validate/gst/validate/gst-validate-utils.h
+++ b/validate/gst/validate/gst-validate-utils.h
@@ -34,30 +34,30 @@
 typedef int (*GstValidateParseVariableFunc) (const gchar *name,
     double *value, gpointer user_data);
 
-GST_EXPORT
+GST_VALIDATE_API
 gdouble gst_validate_utils_parse_expression (const gchar *expr,
                                              GstValidateParseVariableFunc variable_func,
                                              gpointer user_data,
                                              gchar **error);
-GST_EXPORT
+GST_VALIDATE_API
 guint gst_validate_utils_flags_from_str     (GType type, const gchar * str_flags);
-GST_EXPORT
+GST_VALIDATE_API
 gboolean gst_validate_utils_enum_from_str   (GType type,
                                              const gchar * str_enum,
                                              guint * enum_value);
 
-GST_EXPORT
+GST_VALIDATE_API
 GList * gst_validate_utils_structs_parse_from_filename         (const gchar * scenario_file);
-GST_EXPORT
+GST_VALIDATE_API
 GList * gst_validate_structs_parse_from_gfile            (GFile * scenario_file);
 
-GST_EXPORT
+GST_VALIDATE_API
 gboolean gst_validate_element_has_klass (GstElement * element, const gchar * klass);
-GST_EXPORT
+GST_VALIDATE_API
 gboolean gst_validate_utils_get_clocktime (GstStructure *structure, const gchar * name,
         GstClockTime * retval);
 
-GST_EXPORT
+GST_VALIDATE_API
 GstValidateActionReturn gst_validate_object_set_property (GstValidateReporter * reporter,
                                                           GObject * object,
                                                           const gchar * property,

diff --git a/validate/gst/validate/media-descriptor-parser.h b/validate/gst/validate/media-descriptor-parser.h
index 1f0431b..17a58c3 100644 (file)
--- a/validate/gst/validate/media-descriptor-parser.h
+++ b/validate/gst/validate/media-descriptor-parser.h
@@ -29,7 +29,7 @@
 
 G_BEGIN_DECLS
 
-GST_EXPORT
+GST_VALIDATE_API
 GType gst_validate_media_descriptor_parser_get_type (void);
 
 #define GST_TYPE_VALIDATE_MEDIA_DESCRIPTOR_PARSER            (gst_validate_media_descriptor_parser_get_type ())
@@ -55,25 +55,25 @@ typedef struct {
 
 } GstValidateMediaDescriptorParserClass;
 
-GST_EXPORT
+GST_VALIDATE_API
 GstValidateMediaDescriptorParser * gst_validate_media_descriptor_parser_new (GstValidateRunner *runner,
                                                             const gchar * xmlpath,
                                                             GError **error);
-GST_EXPORT GstValidateMediaDescriptorParser *
+GST_VALIDATE_API GstValidateMediaDescriptorParser *
 gst_validate_media_descriptor_parser_new_from_xml                   (GstValidateRunner * runner,
                                                             const gchar * xml,
                                                             GError ** error);
-GST_EXPORT
+GST_VALIDATE_API
 gchar * gst_validate_media_descriptor_parser_get_xml_path        (GstValidateMediaDescriptorParser *parser);
-GST_EXPORT
+GST_VALIDATE_API
 gboolean gst_validate_media_descriptor_parser_add_stream         (GstValidateMediaDescriptorParser *parser,
                                                                   GstPad *pad);
-GST_EXPORT
+GST_VALIDATE_API
 gboolean gst_validate_media_descriptor_parser_add_taglist        (GstValidateMediaDescriptorParser *parser,
                                                                   GstTagList *taglist);
-GST_EXPORT
+GST_VALIDATE_API
 gboolean gst_validate_media_descriptor_parser_all_stream_found   (GstValidateMediaDescriptorParser *parser);
-GST_EXPORT
+GST_VALIDATE_API
 gboolean gst_validate_media_descriptor_parser_all_tags_found     (GstValidateMediaDescriptorParser *parser);
 
 G_END_DECLS

diff --git a/validate/gst/validate/media-descriptor-writer.h b/validate/gst/validate/media-descriptor-writer.h
index 22a906a..0c5712a 100644 (file)
--- a/validate/gst/validate/media-descriptor-writer.h
+++ b/validate/gst/validate/media-descriptor-writer.h
@@ -30,7 +30,7 @@
 
 G_BEGIN_DECLS
 
-GST_EXPORT
+GST_VALIDATE_API
 GType gst_validate_media_descriptor_writer_get_type (void);
 
 #define GST_TYPE_VALIDATE_MEDIA_DESCRIPTOR_WRITER            (gst_validate_media_descriptor_writer_get_type ())
@@ -56,14 +56,14 @@ typedef struct {
 
 } GstValidateMediaDescriptorWriterClass;
 
-GST_EXPORT
+GST_VALIDATE_API
 GstValidateMediaDescriptorWriter * gst_validate_media_descriptor_writer_new_discover (GstValidateRunner *runner,
                                                                      const gchar *uri,
                                                                      gboolean full,
                                                                      gboolean handle_g_logs,
                                                                      GError **err);
 
-GST_EXPORT
+GST_VALIDATE_API
 GstValidateMediaDescriptorWriter * gst_validate_media_descriptor_writer_new          (GstValidateRunner *runner,
                                                                      const gchar *location,
                                                                      GstClockTime duration,
@@ -75,24 +75,24 @@ gboolean gst_validate_media_descriptor_writer_detects_frames     (GstValidateMed
 GstClockTime gst_validate_media_descriptor_writer_get_duration   (GstValidateMediaDescriptorWriter *writer);
 gboolean gst_validate_media_descriptor_writer_get_seekable       (GstValidateMediaDescriptorWriter * writer);
 
-GST_EXPORT
+GST_VALIDATE_API
 gboolean gst_validate_media_descriptor_writer_add_pad            (GstValidateMediaDescriptorWriter *writer,
                                                          GstPad *pad);
-GST_EXPORT
+GST_VALIDATE_API
 gboolean gst_validate_media_descriptor_writer_add_taglist        (GstValidateMediaDescriptorWriter *writer,
                                                          const GstTagList *taglist);
-GST_EXPORT
+GST_VALIDATE_API
 gboolean gst_validate_media_descriptor_writer_add_frame          (GstValidateMediaDescriptorWriter *writer,
                                                          GstPad *pad,
                                                          GstBuffer *buf);
-GST_EXPORT
+GST_VALIDATE_API
 gboolean gst_validate_media_descriptor_writer_add_tags           (GstValidateMediaDescriptorWriter *writer,
                                                          const gchar *stream_id,
                                                          const GstTagList *taglist);
-GST_EXPORT
+GST_VALIDATE_API
 gboolean gst_validate_media_descriptor_writer_write              (GstValidateMediaDescriptorWriter * writer,
                                                          const gchar * filename);
-GST_EXPORT
+GST_VALIDATE_API
 gchar * gst_validate_media_descriptor_writer_serialize           (GstValidateMediaDescriptorWriter *writer);
 
 

diff --git a/validate/gst/validate/media-descriptor.h b/validate/gst/validate/media-descriptor.h
index 0dabb9e..3079cfa 100644 (file)
--- a/validate/gst/validate/media-descriptor.h
+++ b/validate/gst/validate/media-descriptor.h
@@ -112,14 +112,14 @@ typedef struct
   gchar *str_close;
 } GstValidateMediaFrameNode;
 
-GST_EXPORT
+GST_VALIDATE_API
 void gst_validate_filenode_free (GstValidateMediaFileNode *
     filenode);
-GST_EXPORT
+GST_VALIDATE_API
 gboolean gst_validate_tag_node_compare (GstValidateMediaTagNode *
     tnode, const GstTagList * tlist);
 
-GST_EXPORT
+GST_VALIDATE_API
 GType gst_validate_media_descriptor_get_type (void);
 
 #define GST_TYPE_VALIDATE_MEDIA_DESCRIPTOR (gst_validate_media_descriptor_get_type ())
@@ -153,24 +153,24 @@ typedef struct
 
 } GstValidateMediaDescriptorClass;
 
-GST_EXPORT
+GST_VALIDATE_API
 gboolean gst_validate_media_descriptors_compare (GstValidateMediaDescriptor *
     ref, GstValidateMediaDescriptor * compared);
-GST_EXPORT gboolean
+GST_VALIDATE_API gboolean
 gst_validate_media_descriptor_detects_frames (GstValidateMediaDescriptor *
     self);
-GST_EXPORT
+GST_VALIDATE_API
 gboolean gst_validate_media_descriptor_get_buffers (GstValidateMediaDescriptor *
     self, GstPad * pad, GCompareFunc compare_func, GList ** bufs);
-GST_EXPORT gboolean
+GST_VALIDATE_API gboolean
 gst_validate_media_descriptor_has_frame_info (GstValidateMediaDescriptor *
     self);
-GST_EXPORT GstClockTime
+GST_VALIDATE_API GstClockTime
 gst_validate_media_descriptor_get_duration (GstValidateMediaDescriptor * self);
-GST_EXPORT
+GST_VALIDATE_API
 gboolean gst_validate_media_descriptor_get_seekable (GstValidateMediaDescriptor
     * self);
-GST_EXPORT
+GST_VALIDATE_API
 GList *gst_validate_media_descriptor_get_pads (GstValidateMediaDescriptor *
     self);
 G_END_DECLS

diff --git a/validate/gst/validate/meson.build b/validate/gst/validate/meson.build
index 0e461a1..1774b07 100644 (file)
--- a/validate/gst/validate/meson.build
+++ b/validate/gst/validate/meson.build
@@ -21,6 +21,7 @@ gstvalidate_sources = [
 
 gstvalidate_headers = [
     'validate.h',
+    'validate-prelude.h',
     'gst-validate-types.h',
     'gst-validate-bin-monitor.h',
     'gst-validate-pipeline-monitor.h',

diff --git a/validate/gst/validate/validate-prelude.h b/validate/gst/validate/validate-prelude.h
new file mode 100644 (file)
index 0000000..5163463
--- /dev/null
+++ b/validate/gst/validate/validate-prelude.h
@@ -0,0 +1,31 @@
+/* GStreamer Validate Library
+ * Copyright (C) 2018 GStreamer developers
+ *
+ * validate-prelude.h: prelude include header for gst-validate 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_VALIDATE_PRELUDE_H__
+#define __GST_VALIDATE_PRELUDE_H__
+
+#include <gst/gst.h>
+
+#ifndef GST_VALIDATE_API
+#define GST_VALIDATE_API GST_EXPORT
+#endif
+
+#endif /* __GST_VALIDATE_PRELUDE_H__ */

diff --git a/validate/gst/validate/validate.h b/validate/gst/validate/validate.h
index 734aab6..ba43cb8 100644 (file)
--- a/validate/gst/validate/validate.h
+++ b/validate/gst/validate/validate.h
@@ -5,6 +5,8 @@
 #ifndef _GST_VALIDATE_H
 #define _GST_VALIDATE_H
 
+#include <gst/validate/validate-prelude.h>
+
 #include <gst/validate/gst-validate-types.h>
 #include <gst/validate/gst-validate-enums.h>
 #include <gst/validate/gst-validate-scenario.h>
@@ -16,13 +18,13 @@
 #include <gst/validate/gst-validate-reporter.h>
 #include <gst/validate/gst-validate-media-info.h>
 
-GST_EXPORT
+GST_VALIDATE_API
 void gst_validate_init (void);
-GST_EXPORT
+GST_VALIDATE_API
 void gst_validate_deinit (void);
-GST_EXPORT
+GST_VALIDATE_API
 GList * gst_validate_plugin_get_config (GstPlugin * plugin);
-GST_EXPORT
+GST_VALIDATE_API
 gboolean gst_validate_is_initialized (void);
 
 #endif /* _GST_VALIDATE_H */