Commit 1a357ce0 authored by Guido Gunther's avatar Guido Gunther
Browse files

livi-gst-sink: Simplify type definition

"Modern" GObject allows to shrink this considerably
parent 1df40ee0
......@@ -35,6 +35,21 @@ enum {
N_PROPS,
};
struct _GtkGstSink
{
/* <private> */
GstVideoSink parent;
GstVideoInfo v_info;
GtkGstPaintable * paintable;
GdkGLContext * gdk_context;
GstGLDisplay * gst_display;
GstGLContext * gst_app_context;
GstGLContext * gst_context;
};
GST_DEBUG_CATEGORY (gtk_debug_gst_sink);
#define GST_CAT_DEFAULT gtk_debug_gst_sink
......
......@@ -18,8 +18,7 @@
* Boston, MA 02110-1301, USA.
*/
#ifndef __GTK_GST_SINK_PRIVATE_H__
#define __GTK_GST_SINK_PRIVATE_H__
#pragma once
#include "livi-gst-paintable.h"
......@@ -29,39 +28,10 @@
#include <gst/video/gstvideosink.h>
#include <gst/video/video.h>
#define GTK_TYPE_GST_SINK (gtk_gst_sink_get_type())
#define GTK_GST_SINK(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GTK_TYPE_GST_SINK,GtkGstSink))
#define GTK_GST_SINK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GTK_TYPE_GST_SINK,GtkGstSinkClass))
#define GTK_GST_SINK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_GST_SINK, GtkGstSinkClass))
#define GST_IS_GTK_BASE_SINK(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GTK_TYPE_GST_SINK))
#define GST_IS_GTK_BASE_SINK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GTK_TYPE_GST_SINK))
#define GTK_GST_SINK_CAST(obj) ((GtkGstSink*)(obj))
G_BEGIN_DECLS
typedef struct _GtkGstSink GtkGstSink;
typedef struct _GtkGstSinkClass GtkGstSinkClass;
struct _GtkGstSink
{
/* <private> */
GstVideoSink parent;
GstVideoInfo v_info;
GtkGstPaintable * paintable;
GdkGLContext * gdk_context;
GstGLDisplay * gst_display;
GstGLContext * gst_app_context;
GstGLContext * gst_context;
};
#define GTK_TYPE_GST_SINK (gtk_gst_sink_get_type())
struct _GtkGstSinkClass
{
GstVideoSinkClass object_class;
};
GType gtk_gst_sink_get_type (void);
G_DECLARE_FINAL_TYPE (GtkGstSink, gtk_gst_sink, GTK, GST_SINK, GstVideoSink)
G_END_DECLS
#endif /* __GTK_GST_SINK_PRIVATE_H__ */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment