Mercurial > pidgin

comparison libpurple/media-gst.h @ 32433:98520ee78f12

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use G_BEGIN/END_DECLS in public libpurple files. This was previously inconsistent. Sometimes there was even both the GLib macros and an extern "C" line.
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Tue, 03 Jan 2012 23:32:59 +0000
parents 02a2e8183b1d
children
comparison
equal deleted inserted replaced
32432:79fdae8fa875 32433:98520ee78f12
29 29
30 #include "media.h" 30 #include "media.h"
31 #include "mediamanager.h" 31 #include "mediamanager.h"
32 32
33 #include <gst/gst.h> 33 #include <gst/gst.h>
34
35 G_BEGIN_DECLS
36 34
37 #define PURPLE_TYPE_MEDIA_ELEMENT_TYPE (purple_media_element_type_get_type()) 35 #define PURPLE_TYPE_MEDIA_ELEMENT_TYPE (purple_media_element_type_get_type())
38 #define PURPLE_TYPE_MEDIA_ELEMENT_INFO (purple_media_element_info_get_type()) 36 #define PURPLE_TYPE_MEDIA_ELEMENT_INFO (purple_media_element_info_get_type())
39 #define PURPLE_MEDIA_ELEMENT_INFO(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), PURPLE_TYPE_MEDIA_ELEMENT_INFO, PurpleMediaElementInfo)) 37 #define PURPLE_MEDIA_ELEMENT_INFO(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), PURPLE_TYPE_MEDIA_ELEMENT_INFO, PurpleMediaElementInfo))
40 #define PURPLE_MEDIA_ELEMENT_INFO_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), PURPLE_TYPE_MEDIA_ELEMENT_INFO, PurpleMediaElementInfo)) 38 #define PURPLE_MEDIA_ELEMENT_INFO_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), PURPLE_TYPE_MEDIA_ELEMENT_INFO, PurpleMediaElementInfo))
71 69
72 PURPLE_MEDIA_ELEMENT_SRC = 1 << 9, /** can be set as an active src */ 70 PURPLE_MEDIA_ELEMENT_SRC = 1 << 9, /** can be set as an active src */
73 PURPLE_MEDIA_ELEMENT_SINK = 1 << 10, /** can be set as an active sink */ 71 PURPLE_MEDIA_ELEMENT_SINK = 1 << 10, /** can be set as an active sink */
74 } PurpleMediaElementType; 72 } PurpleMediaElementType;
75 73
76 #ifdef __cplusplus 74 G_BEGIN_DECLS
77 extern "C" {
78 #endif
79 75
80 /** 76 /**
81 * Gets the element type's GType. 77 * Gets the element type's GType.
82 * 78 *
83 * @return The element type's GType. 79 * @return The element type's GType.
174 PurpleMediaElementInfo *info); 170 PurpleMediaElementInfo *info);
175 GstElement *purple_media_element_info_call_create( 171 GstElement *purple_media_element_info_call_create(
176 PurpleMediaElementInfo *info, PurpleMedia *media, 172 PurpleMediaElementInfo *info, PurpleMedia *media,
177 const gchar *session_id, const gchar *participant); 173 const gchar *session_id, const gchar *participant);
178 174
179 #ifdef __cplusplus
180 }
181 #endif
182
183 G_END_DECLS 175 G_END_DECLS
184 176
185 #endif /* _PURPLE_MEDIA_GST_H_ */ 177 #endif /* _PURPLE_MEDIA_GST_H_ */