From 89d9aaee48308fd6a73ae327575adb6b9ac35a60 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Wed, 20 Jan 2010 13:30:48 +0100 Subject: [PATCH] [cleanup] Various style and cleanups Various fixes for gtk-doc warnings and making functions without arguments take void as parameter. --- ext/lv2/gstlv2.c | 4 ++-- ext/theora/theoradec.h | 2 +- ext/zbar/gstzbar.h | 1 + gst/asfmux/gstasfmux.c | 6 +++--- gst/asfmux/gstasfobjects.c | 9 ++++++--- gst/asfmux/gstasfobjects.h | 6 +++--- gst/qtmux/descriptors.c | 10 +++++----- gst/qtmux/descriptors.h | 4 ++-- gst/qtmux/properties.c | 18 +++++++++++------- 9 files changed, 34 insertions(+), 26 deletions(-) diff --git a/ext/lv2/gstlv2.c b/ext/lv2/gstlv2.c index 085303e..2983561 100644 --- a/ext/lv2/gstlv2.c +++ b/ext/lv2/gstlv2.c @@ -90,7 +90,7 @@ static GstPlugin *gst_lv2_plugin; GST_DEBUG_CATEGORY_STATIC (lv2_debug); #define GST_CAT_DEFAULT lv2_debug -/** Convert an LV2 port role to a Gst channel positon +/* Convert an LV2 port role to a Gst channel positon * WARNING: If the group has only a single port, * GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER will be returned for pg:centerRole * (which is used by LV2 for mono groups), but this is not correct. In this @@ -139,7 +139,7 @@ gst_lv2_role_to_position (SLV2Value role) return GST_AUDIO_CHANNEL_POSITION_INVALID; } -/** Find and return the group @a uri in @a groups, or NULL if not found */ +/* Find and return the group @a uri in @a groups, or NULL if not found */ static GstLV2Group * gst_lv2_class_find_group (GArray * groups, SLV2Value uri) { diff --git a/ext/theora/theoradec.h b/ext/theora/theoradec.h index 582b305..e9f0eb7 100644 --- a/ext/theora/theoradec.h +++ b/ext/theora/theoradec.h @@ -52,9 +52,9 @@ typedef struct _GstTheoraExpDecClass GstTheoraExpDecClass; */ struct _GstTheoraExpDec { + /* */ GstElement element; - /* */ /* Pads */ GstPad *sinkpad; GstPad *srcpad; diff --git a/ext/zbar/gstzbar.h b/ext/zbar/gstzbar.h index d4cdaaa..1c47a0f 100644 --- a/ext/zbar/gstzbar.h +++ b/ext/zbar/gstzbar.h @@ -47,6 +47,7 @@ typedef struct _GstZBarClass GstZBarClass; */ struct _GstZBar { + /*< private >*/ GstVideoFilter videofilter; /* format */ diff --git a/gst/asfmux/gstasfmux.c b/gst/asfmux/gstasfmux.c index 50889e9..521e054 100644 --- a/gst/asfmux/gstasfmux.c +++ b/gst/asfmux/gstasfmux.c @@ -689,9 +689,9 @@ gst_asf_mux_write_file_properties (GstAsfMux * asfmux, guint8 ** buf) /** * gst_asf_mux_write_stream_properties: - * @param asfmux: - * @param buf: pointer to the data pointer - * @param asfpad: Pad that handles the stream + * @asfmux: + * @buf: pointer to the data pointer + * @asfpad: Pad that handles the stream * * Writes the stream properties object in the buffer * for the stream handled by the #GstAsfPad passed. diff --git a/gst/asfmux/gstasfobjects.c b/gst/asfmux/gstasfobjects.c index d7fd9fd..ccb0836 100644 --- a/gst/asfmux/gstasfobjects.c +++ b/gst/asfmux/gstasfobjects.c @@ -64,7 +64,7 @@ const Guid guids[] = { * Returns: The generated GUID */ Guid -gst_asf_generate_file_id () +gst_asf_generate_file_id (void) { guint32 aux; Guid guid; @@ -168,11 +168,13 @@ gst_asf_get_var_size_field_len (guint8 field_type) /** * gst_asf_file_info_new: + * * Creates a new #GstAsfFileInfo + * * Returns: the created struct */ GstAsfFileInfo * -gst_asf_file_info_new () +gst_asf_file_info_new (void) { return g_new0 (GstAsfFileInfo, 1); } @@ -180,6 +182,7 @@ gst_asf_file_info_new () /** * gst_asf_file_info_reset: * @info: the #GstAsfFileInfo to be reset + * * resets the data of a #GstFileInfo */ void @@ -237,7 +240,7 @@ gst_asf_payload_free (AsfPayload * payload) * Returns: */ guint64 -gst_asf_get_current_time () +gst_asf_get_current_time (void) { GTimeVal timeval; guint64 secs; diff --git a/gst/asfmux/gstasfobjects.h b/gst/asfmux/gstasfobjects.h index 302c42c..a608dce 100644 --- a/gst/asfmux/gstasfobjects.h +++ b/gst/asfmux/gstasfobjects.h @@ -83,21 +83,21 @@ typedef struct _AsfPayload guint16 packet_count; } AsfPayload; -Guid gst_asf_generate_file_id (); +Guid gst_asf_generate_file_id (void); gboolean gst_byte_reader_get_asf_var_size_field (GstByteReader * reader, guint8 field_type, guint32 * var); guint32 gst_asf_read_var_size_field (guint8 * data, guint8 field_type); guint gst_asf_get_var_size_field_len (guint8 field_type); -GstAsfFileInfo *gst_asf_file_info_new (); +GstAsfFileInfo *gst_asf_file_info_new (void); void gst_asf_file_info_reset (GstAsfFileInfo * info); void gst_asf_file_info_free (GstAsfFileInfo * info); guint32 gst_asf_payload_get_size (AsfPayload * payload); void gst_asf_payload_free (AsfPayload * payload); -guint64 gst_asf_get_current_time (); +guint64 gst_asf_get_current_time (void); gboolean gst_asf_match_guid (const guint8 * data, const Guid * g); diff --git a/gst/qtmux/descriptors.c b/gst/qtmux/descriptors.c index fa39b8b..f450fce 100644 --- a/gst/qtmux/descriptors.c +++ b/gst/qtmux/descriptors.c @@ -42,7 +42,7 @@ #include "descriptors.h" -/** +/* * Some mp4 structures (descriptors) use a coding scheme for * representing its size. * It is grouped in bytes. The 1st bit set to 1 means we need another byte, @@ -51,7 +51,7 @@ * The next set of functions handle those values */ -/** +/* * Gets an unsigned integer and packs it into a 'expandable size' format * (as used by mp4 descriptors) * @size: the integer to be parsed @@ -70,7 +70,7 @@ expandable_size_parse (guint64 size, guint8 * ptr, guint32 array_size) } } -/** +/* * Gets how many positions in an array holding an 'expandable size' * are really used * @@ -112,7 +112,7 @@ desc_dec_specific_info_init (DecoderSpecificInfoDescriptor * dsid) } DecoderSpecificInfoDescriptor * -desc_dec_specific_info_new () +desc_dec_specific_info_new (void) { DecoderSpecificInfoDescriptor *desc = g_new0 (DecoderSpecificInfoDescriptor, 1); @@ -151,7 +151,7 @@ desc_es_init (ESDescriptor * es) } ESDescriptor * -desc_es_descriptor_new () +desc_es_descriptor_new (void) { ESDescriptor *es = g_new0 (ESDescriptor, 1); diff --git a/gst/qtmux/descriptors.h b/gst/qtmux/descriptors.h index ee54852..cc633a3 100644 --- a/gst/qtmux/descriptors.h +++ b/gst/qtmux/descriptors.h @@ -138,12 +138,12 @@ typedef struct _ESDescriptor /* --- FUNCTIONS --- */ void desc_es_init (ESDescriptor *es); -ESDescriptor *desc_es_descriptor_new (); +ESDescriptor *desc_es_descriptor_new (void); guint64 desc_es_descriptor_copy_data (ESDescriptor *es, guint8 **buffer, guint64 *size, guint64 *offset); void desc_es_descriptor_clear (ESDescriptor *es); -DecoderSpecificInfoDescriptor *desc_dec_specific_info_new(); +DecoderSpecificInfoDescriptor *desc_dec_specific_info_new(void); void desc_dec_specific_info_free (DecoderSpecificInfoDescriptor *dsid); void desc_dec_specific_info_alloc_data (DecoderSpecificInfoDescriptor *dsid, guint32 size); diff --git a/gst/qtmux/properties.c b/gst/qtmux/properties.c index 7ac9beb..8dafb2e 100644 --- a/gst/qtmux/properties.c +++ b/gst/qtmux/properties.c @@ -142,14 +142,15 @@ prop_copy_fourcc (guint32 prop, guint8 ** buffer, guint64 * size, INT_ARRAY_COPY_FUNC (fourcc, guint32); /** - * Copies a string of bytes without placing its size at the beginning. - * + * prop_copy_fixed_size_string: * @string: the string to be copied * @str_size: size of the string * @buffer: the array to copy the string to * @offset: the position in the buffer array. * This value is updated to the point right after the copied string. * + * Copies a string of bytes without placing its size at the beginning. + * * Returns: the number of bytes copied */ guint64 @@ -160,9 +161,7 @@ prop_copy_fixed_size_string (guint8 * string, guint str_size, guint8 ** buffer, } /** - * Copies a string and its size to an array. Example: - * string = 'abc\0' - * result in the array: [3][a][b][c] (each [x] represents a position) + * prop_copy_size_string: * * @string: the string to be copied * @str_size: size of the string @@ -170,6 +169,10 @@ prop_copy_fixed_size_string (guint8 * string, guint str_size, guint8 ** buffer, * @offset: the position in the buffer array. * This value is updated to the point right after the copied string. * + * Copies a string and its size to an array. Example: + * string = 'abc\0' + * result in the array: [3][a][b][c] (each [x] represents a position) + * * Returns: the number of bytes copied */ guint64 @@ -184,13 +187,14 @@ prop_copy_size_string (guint8 * string, guint str_size, guint8 ** buffer, } /** - * Copies a string including its null terminating char to an array. - * + * prop_copy_null_terminated_string: * @string: the string to be copied * @buffer: the array to copy the string to * @offset: the position in the buffer array. * This value is updated to the point right after the copied string. * + * Copies a string including its null terminating char to an array. + * * Returns: the number of bytes copied */ guint64 -- 2.7.4