Commit 923d72d3 authored by Stefan Sauer's avatar Stefan Sauer

x/xv_image_sink: rename for consitency

Insert '_' to match the CamelCase. This is needed so that the plugin docs can
guess the names from the type name.
parent fb68b711
......@@ -941,17 +941,17 @@ gst_vorbis_tag_get_type
GstXImageSink
<SUBSECTION Standard>
GstXImageSinkClass
GST_XIMAGESINK
GST_IS_XIMAGESINK
GST_XIMAGESINK_CLASS
GST_IS_XIMAGESINK_CLASS
GST_TYPE_XIMAGESINK
GST_X_IMAGE_SINK
GST_IS_X_IMAGE_SINK
GST_X_IMAGE_SINK_CLASS
GST_IS_X_IMAGE_SINK_CLASS
GST_TYPE_X_IMAGE_SINK
GstXImageBuffer
GstXImageBufferClass
GstXContext
GstXWindow
<SUBSECTION Private>
gst_ximage_sink_get_type
gst_x_image_sink_get_type
</SECTION>
<SECTION>
......@@ -960,14 +960,14 @@ gst_ximage_sink_get_type
GstXvImageSink
<SUBSECTION Standard>
GstXvImageSinkClass
GST_XVIMAGESINK
GST_IS_XVIMAGESINK
GST_XVIMAGESINK_CLASS
GST_IS_XVIMAGESINK_CLASS
GST_TYPE_XVIMAGESINK
GST_XV_IMAGE_SINK
GST_IS_XV_IMAGE_SINK
GST_XV_IMAGE_SINK_CLASS
GST_IS_XV_IMAGE_SINK_CLASS
GST_TYPE_XV_IMAGE_SINK
GstXvImageBuffer
GstXvImageBufferClass
GstXvImageFormat
<SUBSECTION Private>
gst_xvimage_sink_get_type
gst_xv_image_sink_get_type
</SECTION>
......@@ -23,20 +23,20 @@
#include "ximagesink.h"
GST_DEBUG_CATEGORY (gst_debug_ximagepool);
GST_DEBUG_CATEGORY (gst_debug_ximagesink);
GST_DEBUG_CATEGORY (gst_debug_x_image_pool);
GST_DEBUG_CATEGORY (gst_debug_x_image_sink);
GST_DEBUG_CATEGORY_STATIC (GST_CAT_PERFORMANCE);
static gboolean
plugin_init (GstPlugin * plugin)
{
if (!gst_element_register (plugin, "ximagesink",
GST_RANK_SECONDARY, GST_TYPE_XIMAGESINK))
GST_RANK_SECONDARY, GST_TYPE_X_IMAGE_SINK))
return FALSE;
GST_DEBUG_CATEGORY_INIT (gst_debug_ximagesink, "ximagesink", 0,
GST_DEBUG_CATEGORY_INIT (gst_debug_x_image_sink, "ximagesink", 0,
"ximagesink element");
GST_DEBUG_CATEGORY_INIT (gst_debug_ximagepool, "ximagepool", 0,
GST_DEBUG_CATEGORY_INIT (gst_debug_x_image_pool, "ximagepool", 0,
"ximagepool object");
GST_DEBUG_CATEGORY_GET (GST_CAT_PERFORMANCE, "GST_PERFORMANCE");
......
......@@ -32,8 +32,8 @@
#include <gst/video/gstvideometa.h>
#include <gst/video/gstvideopool.h>
GST_DEBUG_CATEGORY_EXTERN (gst_debug_ximagepool);
#define GST_CAT_DEFAULT gst_debug_ximagepool
GST_DEBUG_CATEGORY_EXTERN (gst_debug_x_image_pool);
#define GST_CAT_DEFAULT gst_debug_x_image_pool
/* X11 stuff */
static gboolean error_caught = FALSE;
......@@ -419,7 +419,7 @@ xattach_failed:
/* This function checks that it is actually really possible to create an image
using XShm */
gboolean
gst_ximagesink_check_xshm_calls (GstXImageSink * ximagesink,
gst_x_image_sink_check_xshm_calls (GstXImageSink * ximagesink,
GstXContext * xcontext)
{
XImage *ximage;
......@@ -672,7 +672,7 @@ gst_ximage_buffer_pool_new (GstXImageSink * ximagesink)
{
GstXImageBufferPool *pool;
g_return_val_if_fail (GST_IS_XIMAGESINK (ximagesink), NULL);
g_return_val_if_fail (GST_IS_X_IMAGE_SINK (ximagesink), NULL);
pool = g_object_new (GST_TYPE_XIMAGE_BUFFER_POOL, NULL);
pool->sink = gst_object_ref (ximagesink);
......
......@@ -105,7 +105,7 @@ GType gst_ximage_buffer_pool_get_type (void);
GstBufferPool * gst_ximage_buffer_pool_new (GstXImageSink * ximagesink);
gboolean gst_ximagesink_check_xshm_calls (GstXImageSink * ximagesink,
gboolean gst_x_image_sink_check_xshm_calls (GstXImageSink * ximagesink,
GstXContext * xcontext);
G_END_DECLS
......
This diff is collapsed.
......@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
#ifndef __GST_XIMAGESINK_H__
#define __GST_XIMAGESINK_H__
#ifndef __GST_X_IMAGE_SINK_H__
#define __GST_X_IMAGE_SINK_H__
#include <gst/video/gstvideosink.h>
......@@ -42,16 +42,16 @@
#include <gst/video/video.h>
G_BEGIN_DECLS
#define GST_TYPE_XIMAGESINK \
(gst_ximagesink_get_type())
#define GST_XIMAGESINK(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_XIMAGESINK, GstXImageSink))
#define GST_XIMAGESINK_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_XIMAGESINK, GstXImageSinkClass))
#define GST_IS_XIMAGESINK(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE((obj), GST_TYPE_XIMAGESINK))
#define GST_IS_XIMAGESINK_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_XIMAGESINK))
#define GST_TYPE_X_IMAGE_SINK \
(gst_x_image_sink_get_type())
#define GST_X_IMAGE_SINK(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_X_IMAGE_SINK, GstXImageSink))
#define GST_X_IMAGE_SINK_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_X_IMAGE_SINK, GstXImageSinkClass))
#define GST_IS_X_IMAGE_SINK(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE((obj), GST_TYPE_X_IMAGE_SINK))
#define GST_IS_X_IMAGE_SINK_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_X_IMAGE_SINK))
typedef struct _GstXContext GstXContext;
typedef struct _GstXWindow GstXWindow;
......@@ -204,7 +204,7 @@ struct _GstXImageSinkClass
GstVideoSinkClass parent_class;
};
GType gst_ximagesink_get_type (void);
GType gst_x_image_sink_get_type (void);
G_END_DECLS
#endif /* __GST_XIMAGESINK_H__ */
#endif /* __GST_X_IMAGE_SINK_H__ */
......@@ -33,9 +33,9 @@
/* for XkbKeycodeToKeysym */
#include <X11/XKBlib.h>
GST_DEBUG_CATEGORY_EXTERN (gst_debug_xvcontext);
GST_DEBUG_CATEGORY_EXTERN (gst_debug_xv_context);
GST_DEBUG_CATEGORY_EXTERN (GST_CAT_PERFORMANCE);
#define GST_CAT_DEFAULT gst_debug_xvcontext
#define GST_CAT_DEFAULT gst_debug_xv_context
void
gst_xvcontext_config_clear (GstXvContextConfig * config)
......
......@@ -23,23 +23,23 @@
#include "xvimagesink.h"
GST_DEBUG_CATEGORY (gst_debug_xvcontext);
GST_DEBUG_CATEGORY (gst_debug_xvimagepool);
GST_DEBUG_CATEGORY (gst_debug_xvimagesink);
GST_DEBUG_CATEGORY (gst_debug_xv_context);
GST_DEBUG_CATEGORY (gst_debug_xv_image_pool);
GST_DEBUG_CATEGORY (gst_debug_xv_image_sink);
GST_DEBUG_CATEGORY_STATIC (GST_CAT_PERFORMANCE);
static gboolean
plugin_init (GstPlugin * plugin)
{
if (!gst_element_register (plugin, "xvimagesink",
GST_RANK_PRIMARY, GST_TYPE_XVIMAGESINK))
GST_RANK_PRIMARY, GST_TYPE_XV_IMAGE_SINK))
return FALSE;
GST_DEBUG_CATEGORY_INIT (gst_debug_xvcontext, "xcontext", 0,
GST_DEBUG_CATEGORY_INIT (gst_debug_xv_context, "xcontext", 0,
"xcontext miniobject");
GST_DEBUG_CATEGORY_INIT (gst_debug_xvimagesink, "xvimagesink", 0,
GST_DEBUG_CATEGORY_INIT (gst_debug_xv_image_sink, "xvimagesink", 0,
"xvimagesink element");
GST_DEBUG_CATEGORY_INIT (gst_debug_xvimagepool, "xvimagepool", 0,
GST_DEBUG_CATEGORY_INIT (gst_debug_xv_image_pool, "xvimagepool", 0,
"xvimagepool object");
GST_DEBUG_CATEGORY_GET (GST_CAT_PERFORMANCE, "GST_PERFORMANCE");
......
......@@ -34,8 +34,8 @@
#include <gst/video/gstvideopool.h>
GST_DEBUG_CATEGORY_EXTERN (gst_debug_xvimagepool);
#define GST_CAT_DEFAULT gst_debug_xvimagepool
GST_DEBUG_CATEGORY_EXTERN (gst_debug_xv_image_pool);
#define GST_CAT_DEFAULT gst_debug_xv_image_pool
/* bufferpool */
static void gst_xvimage_buffer_pool_finalize (GObject * object);
......
This diff is collapsed.
......@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
#ifndef __GST_XVIMAGESINK_H__
#define __GST_XVIMAGESINK_H__
#ifndef __GST_XV_IMAGE_SINK_H__
#define __GST_XV_IMAGE_SINK_H__
#include <gst/video/gstvideosink.h>
......@@ -26,16 +26,16 @@
#include <gst/video/video.h>
G_BEGIN_DECLS
#define GST_TYPE_XVIMAGESINK \
(gst_xvimagesink_get_type())
#define GST_XVIMAGESINK(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_XVIMAGESINK, GstXvImageSink))
#define GST_XVIMAGESINK_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_XVIMAGESINK, GstXvImageSinkClass))
#define GST_IS_XVIMAGESINK(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE((obj), GST_TYPE_XVIMAGESINK))
#define GST_IS_XVIMAGESINK_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_XVIMAGESINK))
#define GST_TYPE_XV_IMAGE_SINK \
(gst_xv_image_sink_get_type())
#define GST_XV_IMAGE_SINK(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_XV_IMAGE_SINK, GstXvImageSink))
#define GST_XV_IMAGE_SINK_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_XV_IMAGE_SINK, GstXvImageSinkClass))
#define GST_IS_XV_IMAGE_SINK(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE((obj), GST_TYPE_XV_IMAGE_SINK))
#define GST_IS_XV_IMAGE_SINK_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_XV_IMAGE_SINK))
typedef struct _GstXvImageSink GstXvImageSink;
typedef struct _GstXvImageSinkClass GstXvImageSinkClass;
......@@ -127,7 +127,7 @@ struct _GstXvImageSinkClass
GstVideoSinkClass parent_class;
};
GType gst_xvimagesink_get_type (void);
GType gst_xv_image_sink_get_type (void);
G_END_DECLS
#endif /* __GST_XVIMAGESINK_H__ */
#endif /* __GST_XV_IMAGE_SINK_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