summaryrefslogtreecommitdiff
path: root/farstream
diff options
context:
space:
mode:
authorOlivier CrĂȘte <olivier.crete@collabora.com>2012-08-07 15:37:00 -0700
committerOlivier CrĂȘte <olivier.crete@collabora.com>2012-08-07 15:37:00 -0700
commit462fd20e8174f59cf8835871a0f3fed5eb75c5c6 (patch)
tree656c0e6eb2713b509d39f1e8e5e891ad49d644fa /farstream
parent88e90aa877f1acf59374c8011ad2d82071a37b97 (diff)
downloadfarstream-462fd20e8174f59cf8835871a0f3fed5eb75c5c6.tar.gz
Fix annotations to make new gir happier
Diffstat (limited to 'farstream')
-rw-r--r--farstream/fs-candidate.c4
-rw-r--r--farstream/fs-codec.c10
-rw-r--r--farstream/fs-conference.c4
-rw-r--r--farstream/fs-conference.h7
-rw-r--r--farstream/fs-participant.h4
-rw-r--r--farstream/fs-rtp.c6
-rw-r--r--farstream/fs-session.c2
-rw-r--r--farstream/fs-stream-transmitter.c6
-rw-r--r--farstream/fs-stream.c3
-rw-r--r--farstream/fs-transmitter.c2
-rw-r--r--farstream/fs-utils.c4
11 files changed, 23 insertions, 29 deletions
diff --git a/farstream/fs-candidate.c b/farstream/fs-candidate.c
index 8cb8db72..627ef0b2 100644
--- a/farstream/fs-candidate.c
+++ b/farstream/fs-candidate.c
@@ -70,7 +70,7 @@ fs_candidate_list_get_type (void)
}
/**
- * fs_candidate_destroy: (skip):
+ * fs_candidate_destroy: (skip)
* @cand: a #FsCandidate to delete
*
* Frees a #FsCandidate and all its contents
@@ -124,7 +124,7 @@ fs_candidate_copy (const FsCandidate * cand)
}
/**
- * fs_candidate_list_destroy: (skip):
+ * fs_candidate_list_destroy: (skip)
* @candidate_list: A GList of #FsCandidate
*
* Deletes a GList of #FsCandidate and its contents
diff --git a/farstream/fs-codec.c b/farstream/fs-codec.c
index 77036a71..8b78d546 100644
--- a/farstream/fs-codec.c
+++ b/farstream/fs-codec.c
@@ -134,7 +134,7 @@ fs_feedback_parameter_free (FsFeedbackParameter *param)
}
/**
- * fs_codec_destroy: (skip):
+ * fs_codec_destroy: (skip)
* @codec: #FsCodec structure to free
*
* Deletes a #FsCodec structure and all its data. Is a no-op on %NULL codec
@@ -216,7 +216,7 @@ fs_codec_copy (const FsCodec * codec)
}
/**
- * fs_codec_list_destroy: (skip):
+ * fs_codec_list_destroy: (skip)
* @codec_list: a GList of #FsCodec to delete
*
* Deletes a list of #FsCodec structures and the list itself.
@@ -261,7 +261,7 @@ fs_codec_list_copy (const GList *codec_list)
}
/**
- * fs_codec_list_from_keyfile
+ * fs_codec_list_from_keyfile:
* @filename: Name of the #GKeyFile to read the codecs parameters from
* @error: location of a #GError, or NULL if no error occured
*
@@ -478,7 +478,7 @@ fs_codec_list_from_keyfile (const gchar *filename, GError **error)
}
/**
- * fs_media_type_to_string
+ * fs_media_type_to_string:
* @media_type: A media type
*
* Gives a user-printable string representing the media type
@@ -499,7 +499,7 @@ fs_media_type_to_string (FsMediaType media_type)
}
/**
- * fs_codec_to_string
+ * fs_codec_to_string:
* @codec: A farstream codec
*
* Returns a newly-allocated string representing the codec
diff --git a/farstream/fs-conference.c b/farstream/fs-conference.c
index 58edb776..38e50046 100644
--- a/farstream/fs-conference.c
+++ b/farstream/fs-conference.c
@@ -114,7 +114,7 @@ fs_conference_error (GObject *signal_src,
}
/**
- * fs_conference_new_session
+ * fs_conference_new_session:
* @conference: #FsConference interface of a #GstElement
* @media_type: #FsMediaType of the new session
* @error: location of a #GError, or %NULL if no error occured
@@ -151,7 +151,7 @@ fs_conference_new_session (FsConference *conf,
}
/**
- * fs_conference_new_participant
+ * fs_conference_new_participant:
* @conference: #FsConference interface of a #GstElement
* @error: location of a #GError, or %NULL if no error occured
*
diff --git a/farstream/fs-conference.h b/farstream/fs-conference.h
index 35d8f367..fcf68ddc 100644
--- a/farstream/fs-conference.h
+++ b/farstream/fs-conference.h
@@ -49,16 +49,11 @@ G_BEGIN_DECLS
#define FS_CONFERENCE_CAST(obj) \
((FsConference *)(obj))
-/**
- * FsConference:
- *
- * Opaque #FsConference data structure.
- */
typedef struct _FsConference FsConference;
typedef struct _FsConferenceClass FsConferenceClass;
/**
- * FsConference
+ * FsConference:
*
* The #FsConference structure, all the members are private
*/
diff --git a/farstream/fs-participant.h b/farstream/fs-participant.h
index 9ca48f8f..df344339 100644
--- a/farstream/fs-participant.h
+++ b/farstream/fs-participant.h
@@ -86,7 +86,7 @@ struct _FsParticipant
};
/**
- * FS_PARTICIPANT_DATA_LOCK
+ * FS_PARTICIPANT_DATA_LOCK:
* @participant: A #FsParticipant
*
* Locks the participant for data set with g_object_set_data() or
@@ -97,7 +97,7 @@ struct _FsParticipant
g_mutex_lock ((participant)->mutex)
/**
- * FS_PARTICIPANT_DATA_UNLOCK
+ * FS_PARTICIPANT_DATA_UNLOCK:
* @participant: A #FsParticipant
*
* Unlocks the participant for data set with g_object_set_data() or
diff --git a/farstream/fs-rtp.c b/farstream/fs-rtp.c
index 0559cb94..cb1d2e3e 100644
--- a/farstream/fs-rtp.c
+++ b/farstream/fs-rtp.c
@@ -66,7 +66,7 @@ fs_rtp_header_extension_new (guint id, FsStreamDirection direction,
}
/**
- * fs_rtp_header_extension_copy: (skip):
+ * fs_rtp_header_extension_copy: (skip)
* @extension: The RTP header extension definition to copy
*
* Copies a #FsRtpHeaderExtension
@@ -115,7 +115,7 @@ fs_rtp_header_extension_are_equal (FsRtpHeaderExtension *extension1,
}
/**
- * fs_rtp_header_extension_destroy: (skip):
+ * fs_rtp_header_extension_destroy: (skip)
* @extension: A RTP header extension to free
*
* Frees the passed #FsRtpHeaderExtension
@@ -158,7 +158,7 @@ fs_rtp_header_extension_list_copy (GList *extensions)
}
/**
- * fs_rtp_header_extension_list_destroy: (skip):
+ * fs_rtp_header_extension_list_destroy: (skip)
* @extensions: a #GList of #FsRtpHeaderExtension
*
* Frees the passed #GList of #FsRtpHeaderExtension
diff --git a/farstream/fs-session.c b/farstream/fs-session.c
index abb1bc35..cf6c5d0e 100644
--- a/farstream/fs-session.c
+++ b/farstream/fs-session.c
@@ -376,7 +376,7 @@ fs_session_class_init (FsSessionClass *klass)
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
/**
- * FsSession:tos
+ * FsSession:tos:
*
* Sets the IP ToS field (and if possible the IPv6 TCLASS field
*/
diff --git a/farstream/fs-stream-transmitter.c b/farstream/fs-stream-transmitter.c
index 979a2eb2..971d1a4d 100644
--- a/farstream/fs-stream-transmitter.c
+++ b/farstream/fs-stream-transmitter.c
@@ -134,7 +134,7 @@ fs_stream_transmitter_class_init (FsStreamTransmitterClass *klass)
G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
- * FsStreamTransmitter:associate-on-source
+ * FsStreamTransmitter:associate-on-source:
*
* This tells the stream transmitter to associate incoming data with this
* based on the source without looking at the content if possible.
@@ -247,7 +247,7 @@ fs_stream_transmitter_class_init (FsStreamTransmitterClass *klass)
/**
- * FsStreamTransmitter::state-changed
+ * FsStreamTransmitter::state-changed:
* @self: #FsStreamTransmitter that emitted the signal
* @component: the id of the component which state has changed
* @state: the new state of the component
@@ -311,7 +311,7 @@ fs_stream_transmitter_set_property (GObject *object,
/**
- * fs_stream_transmitter_add_remote_candidates
+ * fs_stream_transmitter_add_remote_candidates:
* @streamtransmitter: a #FsStreamTranmitter
* @candidates: (element-type FsCandidate): a #GList of the remote candidates
* @error: location of a #GError, or NULL if no error occured
diff --git a/farstream/fs-stream.c b/farstream/fs-stream.c
index 28a101fc..195e8e15 100644
--- a/farstream/fs-stream.c
+++ b/farstream/fs-stream.c
@@ -608,8 +608,7 @@ fs_stream_iterate_src_pads (FsStream *stream)
* @transmitter: Name of the type of transmitter to use for this stream
* @stream_transmitter_n_parameters: Number of parametrs passed to the stream
* transmitter
- * @stream_transmitter_parameters:
- * (array length=stream_transmitter_n_parameters) (allow-none):
+ * @stream_transmitter_parameters: (array length=stream_transmitter_n_parameters) (allow-none):
* an array of n_parameters #GParameter struct that will be passed
* to the newly-create #FsStreamTransmitter
* @error: location of a #GError, or %NULL if no error occured
diff --git a/farstream/fs-transmitter.c b/farstream/fs-transmitter.c
index 419ac65c..00698590 100644
--- a/farstream/fs-transmitter.c
+++ b/farstream/fs-transmitter.c
@@ -199,7 +199,7 @@ fs_transmitter_class_init (FsTransmitterClass *klass)
G_TYPE_NONE, 2, FS_TYPE_ERROR, G_TYPE_STRING);
/**
- * FsTransmitter::get-recvonly-filter
+ * FsTransmitter::get-recvonly-filter:
* @self: #FsTransmitter that emitted the signal
* @component: The component that the filter will be used for
*
diff --git a/farstream/fs-utils.c b/farstream/fs-utils.c
index 2bb1f762..8bc470d2 100644
--- a/farstream/fs-utils.c
+++ b/farstream/fs-utils.c
@@ -101,7 +101,7 @@ fs_utils_get_default_codec_preferences (GstElement *element)
}
/**
- * fs_utils_get_default_element_properties: (skip):
+ * fs_utils_get_default_element_properties: (skip)
* @element: Element for which to fetch default element properties
*
* This function produces a #GKeyFile that can be fed to
@@ -229,7 +229,7 @@ load_default_rtp_hdrext_preferences_from_path (const gchar *element_name,
}
/**
- * fs_utils_get_default_rtp_header_extension_preferences
+ * fs_utils_get_default_rtp_header_extension_preferences:
* @element: Element for which to fetch default RTP Header Extension preferences
* @media_type: The #FsMediaType for which to get default RTP Header Extension
* preferences