From 570ce4f7c87c74a5f66bf41d8fb31969f5fcafb0 Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Sun, 27 Mar 2016 14:29:58 +0530 Subject: [PATCH] gtk: Fix logging in base widget and fix desc of GL sink Set a default category for gtkgstbasewidget lest the logging go to the 'default' category where it can't be found easily --- ext/gtk/gstgtkglsink.c | 6 +++--- ext/gtk/gstgtksink.c | 7 ++++++- ext/gtk/gtkgstbasewidget.c | 6 ++++++ 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/ext/gtk/gstgtkglsink.c b/ext/gtk/gstgtkglsink.c index f17a88e..4081754 100644 --- a/ext/gtk/gstgtkglsink.c +++ b/ext/gtk/gstgtkglsink.c @@ -54,7 +54,7 @@ static GstStaticPadTemplate gst_gtk_gl_sink_template = #define gst_gtk_gl_sink_parent_class parent_class G_DEFINE_TYPE_WITH_CODE (GstGtkGLSink, gst_gtk_gl_sink, GST_TYPE_GTK_BASE_SINK, GST_DEBUG_CATEGORY_INIT (gst_debug_gtk_gl_sink, - "gtkglsink", 0, "Gtk Video Sink")); + "gtkglsink", 0, "Gtk GL Video Sink")); static void gst_gtk_gl_sink_class_init (GstGtkGLSinkClass * klass) @@ -76,8 +76,8 @@ gst_gtk_gl_sink_class_init (GstGtkGLSinkClass * klass) gstgtkbasesink_class->create_widget = gtk_gst_gl_widget_new; gstgtkbasesink_class->window_title = "Gtk+ GL renderer"; - gst_element_class_set_metadata (gstelement_class, "Gtk Video Sink", - "Sink/Video", "A video sink that renders to a GtkWidget", + gst_element_class_set_metadata (gstelement_class, "Gtk GL Video Sink", + "Sink/Video", "A video sink that renders to a GtkWidget using OpenGL", "Matthew Waters "); gst_element_class_add_static_pad_template (gstelement_class, diff --git a/ext/gtk/gstgtksink.c b/ext/gtk/gstgtksink.c index 083c28d..e9f9d0c 100644 --- a/ext/gtk/gstgtksink.c +++ b/ext/gtk/gstgtksink.c @@ -30,6 +30,9 @@ #include "gtkgstwidget.h" #include "gstgtksink.h" +GST_DEBUG_CATEGORY (gst_debug_gtk_sink); +#define GST_CAT_DEFAULT gst_debug_gtk_sink + #if G_BYTE_ORDER == G_LITTLE_ENDIAN #define FORMATS "{ BGRx, BGRA }" #else @@ -44,7 +47,9 @@ GST_STATIC_PAD_TEMPLATE ("sink", ); #define gst_gtk_sink_parent_class parent_class -G_DEFINE_TYPE (GstGtkSink, gst_gtk_sink, GST_TYPE_GTK_BASE_SINK); +G_DEFINE_TYPE_WITH_CODE (GstGtkSink, gst_gtk_sink, GST_TYPE_GTK_BASE_SINK, + GST_DEBUG_CATEGORY_INIT (gst_debug_gtk_sink, "gtksink", 0, + "Gtk Video Sink")); static void gst_gtk_sink_class_init (GstGtkSinkClass * klass) diff --git a/ext/gtk/gtkgstbasewidget.c b/ext/gtk/gtkgstbasewidget.c index aa02c7e..4858f27 100644 --- a/ext/gtk/gtkgstbasewidget.c +++ b/ext/gtk/gtkgstbasewidget.c @@ -26,6 +26,9 @@ #include "gtkgstbasewidget.h" +GST_DEBUG_CATEGORY (gst_debug_gtk_base_widget); +#define GST_CAT_DEFAULT gst_debug_gtk_base_widget + #define DEFAULT_FORCE_ASPECT_RATIO TRUE #define DEFAULT_PAR_N 0 #define DEFAULT_PAR_D 1 @@ -399,6 +402,9 @@ gtk_gst_base_widget_class_init (GtkGstBaseWidgetClass * klass) widget_klass->button_press_event = gtk_gst_base_widget_button_event; widget_klass->button_release_event = gtk_gst_base_widget_button_event; widget_klass->motion_notify_event = gtk_gst_base_widget_motion_event; + + GST_DEBUG_CATEGORY_INIT (gst_debug_gtk_base_widget, "gtkbasewidget", 0, + "Gtk Video Base Widget"); } void -- 2.7.4