mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 04:36:20 +00:00
Code Issues 1 Projects Releases Wiki Activity

1 fix duplicate #define of gst_marshal_VOID__OBJECT_POINTER 2 make g_critical automatically offer to do stack trace

Browse source 
Original commit message from CVS:
1 fix duplicate #define of gst_marshal_VOID__OBJECT_POINTER
2 make g_critical automatically offer to do stack trace
This commit is contained in:
Joshua N. Pritikin 2001-09-13 21:16:25 +00:00
parent 064447edc8
commit 59d6b74a61
4 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gst/Makefile.am
View file

@ -196,7 +196,12 @@ noinst_HEADERS = \
gstarch.h \ gstarch.h \
gstpropsprivate.h gstpropsprivate.h
CFLAGS = $(LIBGST_CFLAGS) -D_GNU_SOURCE -DGST_CONFIG_DIR=\""$(GST_CONFIG_DIR)"\" CFLAGS = \
$(LIBGST_CFLAGS) \
-D_GNU_SOURCE \
-DG_LOG_DOMAIN=g_log_domain_gstreamer \
-DGST_CONFIG_DIR=\""$(GST_CONFIG_DIR)"\"
LIBS = $(LIBGST_LIBS) LIBS = $(LIBGST_LIBS)
LDFLAGS = "" LDFLAGS = ""
libgst_la_LDFLAGS = -version-info $(GST_LIBVERSION) libgst_la_LDFLAGS = -version-info $(GST_LIBVERSION)

1
gst/gobject2gtk.h
View file

@ -70,7 +70,6 @@ typedef struct _GObjectClass GObjectClass;
#define g_cclosure_marshal_STRING__OBJECT_POINTER gtk_marshal_STRING__OBJECT_POINTER #define g_cclosure_marshal_STRING__OBJECT_POINTER gtk_marshal_STRING__OBJECT_POINTER
#define g_cclosure_marshal_VOID__UINT_POINTER gtk_marshal_NONE__UINT_POINTER #define g_cclosure_marshal_VOID__UINT_POINTER gtk_marshal_NONE__UINT_POINTER
#define gst_marshal_VOID__OBJECT_POINTER gtk_marshal_NONE__POINTER
#define gst_marshal_VOID__INT_INT gtk_marshal_NONE__INT_INT #define gst_marshal_VOID__INT_INT gtk_marshal_NONE__INT_INT
#define gst_marshal_VOID__INT gtk_marshal_NONE__INT #define gst_marshal_VOID__INT gtk_marshal_NONE__INT
#define gst_marshal_VOID__STRING gtk_marshal_NONE__STRING #define gst_marshal_VOID__STRING gtk_marshal_NONE__STRING

16
gst/gst.c
View file

@ -48,6 +48,18 @@ extern gboolean _gst_plugin_spew;
static gboolean gst_init_check (int *argc, gchar ***argv); static gboolean gst_init_check (int *argc, gchar ***argv);
const gchar *g_log_domain_gstreamer = "GStreamer";
static void
debug_log_handler (const gchar *log_domain,
GLogLevelFlags log_level,
const gchar *message,
gpointer user_data)
{
g_log_default_handler(log_domain, log_level, message, user_data);
g_on_error_query(NULL);
}
/** /**
* gst_init: * gst_init:
* @argc: pointer to application's argc * @argc: pointer to application's argc
@ -59,6 +71,7 @@ static gboolean gst_init_check (int *argc, gchar ***argv);
void void
gst_init (int *argc, char **argv[]) gst_init (int *argc, char **argv[])
{ {
GLogLevelFlags llf;
#ifndef GST_DISABLE_TRACE #ifndef GST_DISABLE_TRACE
GstTrace *gst_trace; GstTrace *gst_trace;
#endif #endif
@ -87,6 +100,9 @@ gst_init (int *argc, char **argv[])
exit (0); // FIXME! exit (0); // FIXME!
} }
llf = G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_ERROR | G_LOG_FLAG_FATAL;
g_log_set_handler(g_log_domain_gstreamer, llf, debug_log_handler, NULL);
GST_INFO (GST_CAT_GST_INIT, "Initializing GStreamer Core Library"); GST_INFO (GST_CAT_GST_INIT, "Initializing GStreamer Core Library");
gst_elementfactory_get_type (); gst_elementfactory_get_type ();

2
gst/gstlog.h
View file

@ -23,6 +23,8 @@
#ifndef __GST_LOG_H__ #ifndef __GST_LOG_H__
#define __GST_LOG_H__ #define __GST_LOG_H__
extern const gchar *g_log_domain_gstreamer;
/* information messages */ /* information messages */
#define GST_SHOW_INFO #define GST_SHOW_INFO
#ifdef GST_SHOW_INFO #ifdef GST_SHOW_INFO