gst-libs/gst/video/Makefile.am: compile in copied-over videofilter into the video library

Original commit message from CVS:

* gst-libs/gst/video/Makefile.am:
compile in copied-over videofilter into the video library
* gst-libs/gst/video/videosink.h:
rename the header to gstvideosink.h since it's a base GstObject class
* sys/ximage/ximagesink.h:
* sys/xvimage/xvimagesink.h:
use the new header
This commit is contained in:
Thomas Vander Stichele 2005-11-28 17:32:55 +00:00
parent 078d7c5e8c
commit 4d8c9991a4
5 changed files with 14 additions and 83 deletions

View file

@ -1,3 +1,13 @@
2005-11-28 Thomas Vander Stichele <thomas at apestaart dot org>
* gst-libs/gst/video/Makefile.am:
compile in copied-over videofilter into the video library
* gst-libs/gst/video/videosink.h:
rename the header to gstvideosink.h since it's a base GstObject class
* sys/ximage/ximagesink.h:
* sys/xvimage/xvimagesink.h:
use the new header
2005-11-28 Wim Taymans <wim@fluendo.com>
* gst/playback/gstplaybasebin.c: (group_commit), (probe_triggered):

View file

@ -1,9 +1,9 @@
lib_LTLIBRARIES = libgstvideo-@GST_MAJORMINOR@.la
libgstvideo_@GST_MAJORMINOR@_la_SOURCES = video.c gstvideosink.c
libgstvideo_@GST_MAJORMINOR@_la_SOURCES = video.c gstvideosink.c gstvideofilter.c
libgstvideoincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/video
libgstvideoinclude_HEADERS = video.h videosink.h
libgstvideoinclude_HEADERS = video.h gstvideosink.h gstvideofilter.h
libgstvideo_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS)
libgstvideo_@GST_MAJORMINOR@_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS)

View file

@ -1,79 +0,0 @@
/*
* GStreamer Video sink.
*
* Copyright (C) <2003> Julien Moutte <julien@moutte.net>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#ifndef __GST_VIDEO_SINK_H__
#define __GST_VIDEO_SINK_H__
#include <gst/gst.h>
#include <gst/base/gstbasesink.h>
G_BEGIN_DECLS
#define GST_TYPE_VIDEO_SINK (gst_video_sink_get_type())
#define GST_VIDEO_SINK(obj) \
(G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_VIDEO_SINK, GstVideoSink))
#define GST_VIDEO_SINK_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_VIDEO_SINK, GstVideoSink))
#define GST_IS_VIDEO_SINK(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_VIDEO_SINK))
#define GST_IS_VIDEO_SINK_CLASS(obj) \
(G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_VIDEO_SINK))
#define GST_VIDEO_SINK_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_VIDEO_SINK, GstVideoSinkClass))
#define GST_VIDEO_SINK_PAD GST_BASE_SINK_PAD
#define GST_VIDEO_SINK_CLOCK GST_BASE_SINK_CLOCK
#define GST_VIDEO_SINK_WIDTH(obj) (GST_VIDEO_SINK (obj)->width)
#define GST_VIDEO_SINK_HEIGHT(obj) (GST_VIDEO_SINK (obj)->height)
typedef struct _GstVideoSink GstVideoSink;
typedef struct _GstVideoSinkClass GstVideoSinkClass;
typedef struct _GstVideoRectangle GstVideoRectangle;
struct _GstVideoRectangle {
gint x;
gint y;
gint w;
gint h;
};
struct _GstVideoSink {
GstBaseSink element;
gint width, height;
gpointer _gst_reserved[GST_PADDING];
};
struct _GstVideoSinkClass {
GstBaseSinkClass parent_class;
gpointer _gst_reserved[GST_PADDING];
};
GType gst_video_sink_get_type (void);
void gst_video_sink_center_rect (GstVideoRectangle src, GstVideoRectangle dst,
GstVideoRectangle *result, gboolean scaling);
G_END_DECLS
#endif /* __GST_VIDEO_SINK_H__ */

View file

@ -20,7 +20,7 @@
#ifndef __GST_XIMAGESINK_H__
#define __GST_XIMAGESINK_H__
#include <gst/video/videosink.h>
#include <gst/video/gstvideosink.h>
#ifdef HAVE_XSHM
#include <sys/types.h>

View file

@ -20,7 +20,7 @@
#ifndef __GST_XVIMAGESINK_H__
#define __GST_XVIMAGESINK_H__
#include <gst/video/videosink.h>
#include <gst/video/gstvideosink.h>
#ifdef HAVE_XSHM
#include <sys/types.h>