mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-01-27 09:38:17 +00:00
gst-libs/gst/colorbalance/colorbalance.c: Adding a default type.
Original commit message from CVS: 2004-01-14 Julien MOUTTE <julien@moutte.net> * gst-libs/gst/colorbalance/colorbalance.c: (gst_color_balance_class_init): Adding a default type. * gst-libs/gst/colorbalance/colorbalance.h: Adding a macro to access the type. * gst/videofilter/gstvideobalance.c: (gst_videobalance_get_type), (gst_videobalance_dispose), (gst_videobalance_class_init), (gst_videobalance_init), (gst_videobalance_interface_supported), (gst_videobalance_interface_init), (gst_videobalance_colorbalance_list_channels), (gst_videobalance_colorbalance_set_value), (gst_videobalance_colorbalance_get_value), (gst_videobalance_colorbalance_init): Implementing colorbalance interface. * gst/videofilter/gstvideobalance.h: Adding colorbalance channels list. * sys/ximage/ximagesink.c: (gst_ximagesink_set_xwindow_id): Fixing a bug which was triggering a BadAccess X error when setting an overlay before pad was really negotiated. * sys/xvimage/xvimagesink.c: (gst_xvimagesink_colorbalance_init): Using the colorbalance type macro.
This commit is contained in:
parent
7aa92e04bf
commit
2e376792cb
7 changed files with 35 additions and 3 deletions
23
ChangeLog
23
ChangeLog
|
@ -1,3 +1,26 @@
|
||||||
|
2004-01-14 Julien MOUTTE <julien@moutte.net>
|
||||||
|
|
||||||
|
* gst-libs/gst/colorbalance/colorbalance.c:
|
||||||
|
(gst_color_balance_class_init): Adding a default type.
|
||||||
|
* gst-libs/gst/colorbalance/colorbalance.h: Adding a macro to access
|
||||||
|
the type.
|
||||||
|
* gst/videofilter/gstvideobalance.c: (gst_videobalance_get_type),
|
||||||
|
(gst_videobalance_dispose), (gst_videobalance_class_init),
|
||||||
|
(gst_videobalance_init), (gst_videobalance_interface_supported),
|
||||||
|
(gst_videobalance_interface_init),
|
||||||
|
(gst_videobalance_colorbalance_list_channels),
|
||||||
|
(gst_videobalance_colorbalance_set_value),
|
||||||
|
(gst_videobalance_colorbalance_get_value),
|
||||||
|
(gst_videobalance_colorbalance_init): Implementing colorbalance
|
||||||
|
interface.
|
||||||
|
* gst/videofilter/gstvideobalance.h: Adding colorbalance channels
|
||||||
|
list.
|
||||||
|
* sys/ximage/ximagesink.c: (gst_ximagesink_set_xwindow_id): Fixing a
|
||||||
|
bug which was triggering a BadAccess X error when setting an overlay
|
||||||
|
before pad was really negotiated.
|
||||||
|
* sys/xvimage/xvimagesink.c: (gst_xvimagesink_colorbalance_init):
|
||||||
|
Using the colorbalance type macro.
|
||||||
|
|
||||||
2004-01-14 Benjamin Otte <in7y118@public.uni-hamburg.de>
|
2004-01-14 Benjamin Otte <in7y118@public.uni-hamburg.de>
|
||||||
|
|
||||||
* ext/flac/gstflacenc.c: (gst_flacenc_set_metadata),
|
* ext/flac/gstflacenc.c: (gst_flacenc_set_metadata),
|
||||||
|
|
|
@ -82,6 +82,8 @@ gst_color_balance_class_init (GstColorBalanceClass *klass)
|
||||||
initialized = TRUE;
|
initialized = TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
klass->balance_type = GST_COLOR_BALANCE_SOFTWARE;
|
||||||
|
|
||||||
/* default virtual functions */
|
/* default virtual functions */
|
||||||
klass->list_channels = NULL;
|
klass->list_channels = NULL;
|
||||||
klass->set_value = NULL;
|
klass->set_value = NULL;
|
||||||
|
|
|
@ -41,6 +41,8 @@ G_BEGIN_DECLS
|
||||||
(G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_COLOR_BALANCE))
|
(G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_COLOR_BALANCE))
|
||||||
#define GST_COLOR_BALANCE_GET_CLASS(inst) \
|
#define GST_COLOR_BALANCE_GET_CLASS(inst) \
|
||||||
(G_TYPE_INSTANCE_GET_INTERFACE ((inst), GST_TYPE_COLOR_BALANCE, GstColorBalanceClass))
|
(G_TYPE_INSTANCE_GET_INTERFACE ((inst), GST_TYPE_COLOR_BALANCE, GstColorBalanceClass))
|
||||||
|
|
||||||
|
#define GST_COLOR_BALANCE_TYPE(klass) (klass->balance_type)
|
||||||
|
|
||||||
typedef struct _GstColorBalance GstColorBalance;
|
typedef struct _GstColorBalance GstColorBalance;
|
||||||
|
|
||||||
|
|
|
@ -82,6 +82,8 @@ gst_color_balance_class_init (GstColorBalanceClass *klass)
|
||||||
initialized = TRUE;
|
initialized = TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
klass->balance_type = GST_COLOR_BALANCE_SOFTWARE;
|
||||||
|
|
||||||
/* default virtual functions */
|
/* default virtual functions */
|
||||||
klass->list_channels = NULL;
|
klass->list_channels = NULL;
|
||||||
klass->set_value = NULL;
|
klass->set_value = NULL;
|
||||||
|
|
|
@ -41,6 +41,8 @@ G_BEGIN_DECLS
|
||||||
(G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_COLOR_BALANCE))
|
(G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_COLOR_BALANCE))
|
||||||
#define GST_COLOR_BALANCE_GET_CLASS(inst) \
|
#define GST_COLOR_BALANCE_GET_CLASS(inst) \
|
||||||
(G_TYPE_INSTANCE_GET_INTERFACE ((inst), GST_TYPE_COLOR_BALANCE, GstColorBalanceClass))
|
(G_TYPE_INSTANCE_GET_INTERFACE ((inst), GST_TYPE_COLOR_BALANCE, GstColorBalanceClass))
|
||||||
|
|
||||||
|
#define GST_COLOR_BALANCE_TYPE(klass) (klass->balance_type)
|
||||||
|
|
||||||
typedef struct _GstColorBalance GstColorBalance;
|
typedef struct _GstColorBalance GstColorBalance;
|
||||||
|
|
||||||
|
|
|
@ -1002,8 +1002,9 @@ gst_ximagesink_set_xwindow_id (GstXOverlay *overlay, XID xwindow_id)
|
||||||
|
|
||||||
/* If that new window geometry differs from our one we try to
|
/* If that new window geometry differs from our one we try to
|
||||||
renegotiate caps */
|
renegotiate caps */
|
||||||
if (xwindow->width != GST_VIDEOSINK_WIDTH (ximagesink) ||
|
if (gst_pad_is_negotiated (GST_VIDEOSINK_PAD (ximagesink)) &&
|
||||||
xwindow->height != GST_VIDEOSINK_HEIGHT (ximagesink))
|
(xwindow->width != GST_VIDEOSINK_WIDTH (ximagesink) ||
|
||||||
|
xwindow->height != GST_VIDEOSINK_HEIGHT (ximagesink)))
|
||||||
{
|
{
|
||||||
GstPadLinkReturn r;
|
GstPadLinkReturn r;
|
||||||
r = gst_pad_try_set_caps (GST_VIDEOSINK_PAD (ximagesink),
|
r = gst_pad_try_set_caps (GST_VIDEOSINK_PAD (ximagesink),
|
||||||
|
|
|
@ -1297,7 +1297,7 @@ gst_xvimagesink_colorbalance_get_value (GstColorBalance *balance,
|
||||||
static void
|
static void
|
||||||
gst_xvimagesink_colorbalance_init (GstColorBalanceClass *iface)
|
gst_xvimagesink_colorbalance_init (GstColorBalanceClass *iface)
|
||||||
{
|
{
|
||||||
iface->balance_type = GST_COLOR_BALANCE_HARDWARE;
|
GST_COLOR_BALANCE_TYPE (iface) = GST_COLOR_BALANCE_HARDWARE;
|
||||||
iface->list_channels = gst_xvimagesink_colorbalance_list_channels;
|
iface->list_channels = gst_xvimagesink_colorbalance_list_channels;
|
||||||
iface->set_value = gst_xvimagesink_colorbalance_set_value;
|
iface->set_value = gst_xvimagesink_colorbalance_set_value;
|
||||||
iface->get_value = gst_xvimagesink_colorbalance_get_value;
|
iface->get_value = gst_xvimagesink_colorbalance_get_value;
|
||||||
|
|
Loading…
Reference in a new issue