From 62e5e5f2e38fd276a1d3e9dc2fe65e2cf4ee0461 Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Fri, 22 Jan 2016 19:50:15 +0100 Subject: [PATCH] validate: Misc annotation and gi friendly cleanups Differential Revision: https://phabricator.freedesktop.org/D703 --- .../gst/validate/gst-validate-bin-monitor.c | 2 +- .../validate/gst-validate-element-monitor.c | 2 +- validate/gst/validate/gst-validate-monitor.c | 23 ------------------- .../gst/validate/gst-validate-pad-monitor.c | 2 +- .../validate/gst-validate-pipeline-monitor.c | 2 +- validate/gst/validate/gst-validate-scenario.h | 3 ++- .../gst/validate/media-descriptor-parser.c | 3 +-- .../gst/validate/media-descriptor-parser.h | 3 +-- .../gst/validate/media-descriptor-writer.c | 3 +-- .../gst/validate/media-descriptor-writer.h | 3 +-- validate/gst/validate/media-descriptor.h | 3 +-- validate/gst/validate/validate.c | 8 +++---- 12 files changed, 14 insertions(+), 43 deletions(-) diff --git a/validate/gst/validate/gst-validate-bin-monitor.c b/validate/gst/validate/gst-validate-bin-monitor.c index 241c606fb4..009d663323 100644 --- a/validate/gst/validate/gst-validate-bin-monitor.c +++ b/validate/gst/validate/gst-validate-bin-monitor.c @@ -165,7 +165,7 @@ gst_validate_bin_monitor_init (GstValidateBinMonitor * bin_monitor) /** * gst_validate_bin_monitor_new: - * @bin: (transfer-none): a #GstBin to run Validate on + * @bin: (transfer none): a #GstBin to run Validate on */ GstValidateBinMonitor * gst_validate_bin_monitor_new (GstBin * bin, GstValidateRunner * runner, diff --git a/validate/gst/validate/gst-validate-element-monitor.c b/validate/gst/validate/gst-validate-element-monitor.c index b518c21752..1d8383edd9 100644 --- a/validate/gst/validate/gst-validate-element-monitor.c +++ b/validate/gst/validate/gst-validate-element-monitor.c @@ -139,7 +139,7 @@ gst_validate_element_monitor_init (GstValidateElementMonitor * element_monitor) /** * gst_validate_element_monitor_new: - * @element: (transfer-none): a #GstElement to run Validate on + * @element: (transfer none): a #GstElement to run Validate on */ GstValidateElementMonitor * gst_validate_element_monitor_new (GstElement * element, diff --git a/validate/gst/validate/gst-validate-monitor.c b/validate/gst/validate/gst-validate-monitor.c index ddd115db47..284200190e 100644 --- a/validate/gst/validate/gst-validate-monitor.c +++ b/validate/gst/validate/gst-validate-monitor.c @@ -175,29 +175,6 @@ gst_validate_monitor_init (GstValidateMonitor * monitor) g_queue_init (&monitor->overrides); } -#if 0 -/* This shouldn't be used. it's a base class */ -/** - * gst_validate_monitor_new: - * @element: (transfer-none): a #GObject to run Validate on - */ -GstValidateMonitor * -gst_validate_monitor_new (GObject * object) -{ - GstValidateMonitor *monitor = - g_object_new (GST_TYPE_VALIDATE_MONITOR, "object", - G_TYPE_OBJECT, object, NULL); - - if (GST_VALIDATE_MONITOR_GET_OBJECT (monitor) == NULL) { - /* setup failed, no use on returning this monitor */ - g_object_unref (monitor); - return NULL; - } - - return monitor; -} -#endif - static gboolean gst_validate_monitor_do_setup (GstValidateMonitor * monitor) { diff --git a/validate/gst/validate/gst-validate-pad-monitor.c b/validate/gst/validate/gst-validate-pad-monitor.c index ab7ab597c5..8d61bb9d29 100644 --- a/validate/gst/validate/gst-validate-pad-monitor.c +++ b/validate/gst/validate/gst-validate-pad-monitor.c @@ -897,7 +897,7 @@ gst_validate_pad_monitor_init (GstValidatePadMonitor * pad_monitor) /** * gst_validate_pad_monitor_new: - * @pad: (transfer-none): a #GstPad to run Validate on + * @pad: (transfer none): a #GstPad to run Validate on */ GstValidatePadMonitor * gst_validate_pad_monitor_new (GstPad * pad, GstValidateRunner * runner, diff --git a/validate/gst/validate/gst-validate-pipeline-monitor.c b/validate/gst/validate/gst-validate-pipeline-monitor.c index 182a554806..8081892bc3 100644 --- a/validate/gst/validate/gst-validate-pipeline-monitor.c +++ b/validate/gst/validate/gst-validate-pipeline-monitor.c @@ -219,7 +219,7 @@ gst_validate_pipeline_monitor_create_scenarios (GstValidateBinMonitor * monitor) /** * gst_validate_pipeline_monitor_new: - * @pipeline: (transfer-none): a #GstPipeline to run Validate on + * @pipeline: (transfer none): a #GstPipeline to run Validate on */ GstValidatePipelineMonitor * gst_validate_pipeline_monitor_new (GstPipeline * pipeline, diff --git a/validate/gst/validate/gst-validate-scenario.h b/validate/gst/validate/gst-validate-scenario.h index 84af999388..82c2850fff 100644 --- a/validate/gst/validate/gst-validate-scenario.h +++ b/validate/gst/validate/gst-validate-scenario.h @@ -158,9 +158,10 @@ typedef enum } GstValidateActionTypeFlags; /** + * GstValidateActionType: * @name: The name of the new action type to add * @implementer_namespace: The namespace of the implementer of the action type - * @execute: (virtual do_execute): The function to be called to execute the action + * @execute: The function to be called to execute the action * @parameters: (allow-none) (array zero-terminated=1) (element-type GstValidate.ActionParameter): The #GstValidateActionParameter usable as parameter of the type * @description: A description of the new type * @flags: The flags of the action type diff --git a/validate/gst/validate/media-descriptor-parser.c b/validate/gst/validate/media-descriptor-parser.c index 8cde648d43..fe6aae789a 100644 --- a/validate/gst/validate/media-descriptor-parser.c +++ b/validate/gst/validate/media-descriptor-parser.c @@ -1,5 +1,4 @@ -/** - * Gstreamer +/* Gstreamer * * Copyright (c) 2012, Collabora Ltd. * Author: Thibault Saunier diff --git a/validate/gst/validate/media-descriptor-parser.h b/validate/gst/validate/media-descriptor-parser.h index 4c08119b9d..09be8f23ba 100644 --- a/validate/gst/validate/media-descriptor-parser.h +++ b/validate/gst/validate/media-descriptor-parser.h @@ -1,5 +1,4 @@ -/** - * GstValidate +/* GstValidate * * Copyright (c) 2012, Collabora Ltd * Author: Thibault Saunier diff --git a/validate/gst/validate/media-descriptor-writer.c b/validate/gst/validate/media-descriptor-writer.c index d97f49eea1..e2757fe27e 100644 --- a/validate/gst/validate/media-descriptor-writer.c +++ b/validate/gst/validate/media-descriptor-writer.c @@ -1,5 +1,4 @@ -/** - * Gstreamer +/* GstValidate * * Copyright (c) 2012, Collabora Ltd. * Author: Thibault Saunier diff --git a/validate/gst/validate/media-descriptor-writer.h b/validate/gst/validate/media-descriptor-writer.h index 4684a3e6f8..8157623bb8 100644 --- a/validate/gst/validate/media-descriptor-writer.h +++ b/validate/gst/validate/media-descriptor-writer.h @@ -1,5 +1,4 @@ -/** - * Insanity QA system +/* GstValidate * * Copyright (c) 2012, Collabora Ltd * Author: Thibault Saunier diff --git a/validate/gst/validate/media-descriptor.h b/validate/gst/validate/media-descriptor.h index e2d486d2ec..218ed2fa8d 100644 --- a/validate/gst/validate/media-descriptor.h +++ b/validate/gst/validate/media-descriptor.h @@ -1,5 +1,4 @@ -/** - * GstValidate +/* GstValidate * * Copyright (c) 2012, Collabora Ltd. * Author: Thibault Saunier diff --git a/validate/gst/validate/validate.c b/validate/gst/validate/validate.c index 0103a19ba5..10a1277bf9 100644 --- a/validate/gst/validate/validate.c +++ b/validate/gst/validate/validate.c @@ -27,7 +27,7 @@ #ifdef HAVE_CONFIG_H # include "config.h" -#endif +#endif /* HAVE_CONFIG_H */ /* For g_stat () */ #include @@ -42,9 +42,8 @@ #ifdef G_OS_WIN32 #define WIN32_LEAN_AND_MEAN /* prevents from including too many things */ #include /* GetStdHandle, windows console */ - HMODULE _priv_gstvalidate_dll_handle = NULL; -#endif +#endif /* G_OS_WIN32 */ GST_DEBUG_CATEGORY (gstvalidate_debug); @@ -64,8 +63,7 @@ DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } - -#endif +#endif /* G_OS_WIN32 */ static GstRegistry * gst_validate_registry_get (void)