mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-23 02:01:12 +00:00
Patched .h files for C++ support.
Original commit message from CVS: Patched .h files for C++ support.
This commit is contained in:
parent
409d3fbdec
commit
c1044a081b
4 changed files with 22 additions and 2 deletions
|
@ -49,12 +49,20 @@
|
|||
|
||||
#include <gst/gstparse.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif /* __cplusplus */
|
||||
|
||||
/* initialize GST */
|
||||
void gst_init(int *argc,char **argv[]);
|
||||
|
||||
void gst_main (void);
|
||||
void gst_main_quit (void);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif /* __cplusplus */
|
||||
|
||||
#include <gst/gstlog.h>
|
||||
|
||||
#endif /* __GST_H__ */
|
||||
|
|
|
@ -37,7 +37,11 @@
|
|||
|
||||
typedef struct _GstCaps GstCaps;
|
||||
typedef gpointer GstCapsFactoryEntry;
|
||||
#ifdef __cplusplus
|
||||
typedef GstCapsFactoryEntry * GstCapsFactory;
|
||||
#else // C++ was unable to compile with this
|
||||
typedef GstCapsFactoryEntry GstCapsFactory[];
|
||||
#endif
|
||||
|
||||
struct _GstCaps {
|
||||
gchar *name; /* the name of this caps */
|
||||
|
@ -62,7 +66,7 @@ const gchar* gst_caps_get_mime (GstCaps *caps);
|
|||
void gst_caps_set_mime (GstCaps *caps, const gchar *mime);
|
||||
|
||||
guint16 gst_caps_get_type_id (GstCaps *caps);
|
||||
void gst_caps_set_type_id (GstCaps *caps, guint16 typeid);
|
||||
void gst_caps_set_type_id (GstCaps *caps, guint16 /*typeid*/);
|
||||
|
||||
GstCaps* gst_caps_set_props (GstCaps *caps, GstProps *props);
|
||||
GstProps* gst_caps_get_props (GstCaps *caps);
|
||||
|
|
|
@ -139,7 +139,7 @@ _gst_debug_register_funcptr (void *ptr, gchar *ptrname)
|
|||
static inline gchar *
|
||||
_gst_debug_nameof_funcptr (void *ptr)
|
||||
{
|
||||
gchar *ptrname = __gst_function_pointers ? g_hash_table_lookup(__gst_function_pointers,ptr) : NULL;
|
||||
gchar *ptrname = (gchar*)( __gst_function_pointers ? g_hash_table_lookup(__gst_function_pointers,ptr) : NULL );
|
||||
// FIXME this must go away, it's a major leak
|
||||
if (!ptrname) return g_strdup_printf("%p",ptr);
|
||||
else return ptrname;
|
||||
|
|
|
@ -26,6 +26,10 @@
|
|||
|
||||
#include <gtk/gtk.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif /* __cplusplus */
|
||||
|
||||
gint gst_util_get_int_arg (GtkObject *object, guchar *argname);
|
||||
gboolean gst_util_get_bool_arg (GtkObject *object, guchar *argname);
|
||||
glong gst_util_get_long_arg (GtkObject *object, guchar *argname);
|
||||
|
@ -37,4 +41,8 @@ GtkWidget* gst_util_get_widget_arg (GtkObject *object, guchar *argname);
|
|||
|
||||
void gst_util_dump_mem (guchar *mem, guint size);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif /* __cplusplus */
|
||||
|
||||
#endif /* __GST_UTILS_H__ */
|
||||
|
|
Loading…
Reference in a new issue