mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-04 01:32:42 +00:00
Code Issues 1 Projects Releases Wiki Activity

libs/gst/controller/: Move some private declarations into private headers.

Browse source 
Original commit message from CVS:
* libs/gst/controller/gstcontrollerprivate.h:
* libs/gst/controller/gsthelper.c:
* libs/gst/controller/gstinterpolation.c:
* libs/gst/controller/gstinterpolationcontrolsource.c:
(gst_interpolation_control_source_set_interpolation_mode):
* libs/gst/controller/gstinterpolationcontrolsourceprivate.h:
* libs/gst/controller/lib.c:
Move some private declarations into private headers.
This commit is contained in:
Sebastian Dröge 2008-05-03 15:25:25 +00:00
parent 64b6f63c64
commit 18d8507c0b
7 changed files with 44 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
2008-05-03 Sebastian Dröge <slomo@circular-chaos.org>
* libs/gst/controller/gstcontrollerprivate.h:
* libs/gst/controller/gsthelper.c:
* libs/gst/controller/gstinterpolation.c:
* libs/gst/controller/gstinterpolationcontrolsource.c:
(gst_interpolation_control_source_set_interpolation_mode):
* libs/gst/controller/gstinterpolationcontrolsourceprivate.h:
* libs/gst/controller/lib.c:
Move some private declarations into private headers.
2008-05-02 Sebastian Dröge <slomo@circular-chaos.org> 2008-05-02 Sebastian Dröge <slomo@circular-chaos.org>
* gst/gstdebugutils.c: (debug_dump_element_pad): * gst/gstdebugutils.c: (debug_dump_element_pad):

2
libs/gst/controller/gstcontrollerprivate.h
View file

@ -45,6 +45,8 @@ typedef struct _GstControlledProperty
#define GST_CONTROLLED_PROPERTY(obj) ((GstControlledProperty *)(obj)) #define GST_CONTROLLED_PROPERTY(obj) ((GstControlledProperty *)(obj))
extern GQuark priv_gst_controller_key;
G_END_DECLS G_END_DECLS
#endif /* __GST_CONTROLLER_PRIVATE_H__ */ #endif /* __GST_CONTROLLER_PRIVATE_H__ */

2
libs/gst/controller/gsthelper.c
View file

@ -41,8 +41,6 @@
#define GST_CAT_DEFAULT controller_debug #define GST_CAT_DEFAULT controller_debug
GST_DEBUG_CATEGORY_EXTERN (GST_CAT_DEFAULT); GST_DEBUG_CATEGORY_EXTERN (GST_CAT_DEFAULT);
extern GQuark priv_gst_controller_key;
/** /**
* gst_object_control_properties: * gst_object_control_properties:
* @object: the object of which some properties should be controlled * @object: the object of which some properties should be controlled

6
libs/gst/controller/gstinterpolation.c
View file

@ -866,9 +866,8 @@ static GstInterpolateMethod interpolate_cubic = {
(GstControlSourceGetValueArray) NULL (GstControlSourceGetValueArray) NULL
}; };
/* register all interpolation methods */ /* register all interpolation methods */
GstInterpolateMethod *interpolation_methods[] = { GstInterpolateMethod *priv_gst_interpolation_methods[] = {
&interpolate_none, &interpolate_none,
&interpolate_trigger, &interpolate_trigger,
&interpolate_linear, &interpolate_linear,
@ -876,4 +875,5 @@ GstInterpolateMethod *interpolation_methods[] = {
&interpolate_cubic &interpolate_cubic
}; };
guint num_interpolation_methods = G_N_ELEMENTS (interpolation_methods); guint priv_gst_num_interpolation_methods =
G_N_ELEMENTS (priv_gst_interpolation_methods);

50
libs/gst/controller/gstinterpolationcontrolsource.c
View file

@ -44,9 +44,6 @@
#include "gstinterpolationcontrolsource.h" #include "gstinterpolationcontrolsource.h"
#include "gstinterpolationcontrolsourceprivate.h" #include "gstinterpolationcontrolsourceprivate.h"
extern GstInterpolateMethod *interpolation_methods[];
extern guint num_interpolation_methods;
static void gst_interpolation_control_source_init (GstInterpolationControlSource static void gst_interpolation_control_source_init (GstInterpolationControlSource
* self); * self);
static void static void
@ -133,7 +130,8 @@ gboolean
gboolean ret = TRUE; gboolean ret = TRUE;
GstControlSource *csource = GST_CONTROL_SOURCE (self); GstControlSource *csource = GST_CONTROL_SOURCE (self);
if (mode >= num_interpolation_methods || interpolation_methods[mode] == NULL) { if (mode >= priv_gst_num_interpolation_methods
|| priv_gst_interpolation_methods[mode] == NULL) {
GST_WARNING ("interpolation mode %d invalid or not implemented yet", mode); GST_WARNING ("interpolation mode %d invalid or not implemented yet", mode);
return FALSE; return FALSE;
} }
@ -151,68 +149,68 @@ gboolean
g_mutex_lock (self->lock); g_mutex_lock (self->lock);
switch (self->priv->base) { switch (self->priv->base) {
case G_TYPE_INT: case G_TYPE_INT:
csource->get_value = interpolation_methods[mode]->get_int; csource->get_value = priv_gst_interpolation_methods[mode]->get_int;
csource->get_value_array = csource->get_value_array =
interpolation_methods[mode]->get_int_value_array; priv_gst_interpolation_methods[mode]->get_int_value_array;
break; break;
case G_TYPE_UINT:{ case G_TYPE_UINT:{
csource->get_value = interpolation_methods[mode]->get_uint; csource->get_value = priv_gst_interpolation_methods[mode]->get_uint;
csource->get_value_array = csource->get_value_array =
interpolation_methods[mode]->get_uint_value_array; priv_gst_interpolation_methods[mode]->get_uint_value_array;
break; break;
} }
case G_TYPE_LONG:{ case G_TYPE_LONG:{
csource->get_value = interpolation_methods[mode]->get_long; csource->get_value = priv_gst_interpolation_methods[mode]->get_long;
csource->get_value_array = csource->get_value_array =
interpolation_methods[mode]->get_long_value_array; priv_gst_interpolation_methods[mode]->get_long_value_array;
break; break;
} }
case G_TYPE_ULONG:{ case G_TYPE_ULONG:{
csource->get_value = interpolation_methods[mode]->get_ulong; csource->get_value = priv_gst_interpolation_methods[mode]->get_ulong;
csource->get_value_array = csource->get_value_array =
interpolation_methods[mode]->get_ulong_value_array; priv_gst_interpolation_methods[mode]->get_ulong_value_array;
break; break;
} }
case G_TYPE_INT64:{ case G_TYPE_INT64:{
csource->get_value = interpolation_methods[mode]->get_int64; csource->get_value = priv_gst_interpolation_methods[mode]->get_int64;
csource->get_value_array = csource->get_value_array =
interpolation_methods[mode]->get_int64_value_array; priv_gst_interpolation_methods[mode]->get_int64_value_array;
break; break;
} }
case G_TYPE_UINT64:{ case G_TYPE_UINT64:{
csource->get_value = interpolation_methods[mode]->get_uint64; csource->get_value = priv_gst_interpolation_methods[mode]->get_uint64;
csource->get_value_array = csource->get_value_array =
interpolation_methods[mode]->get_uint64_value_array; priv_gst_interpolation_methods[mode]->get_uint64_value_array;
break; break;
} }
case G_TYPE_FLOAT:{ case G_TYPE_FLOAT:{
csource->get_value = interpolation_methods[mode]->get_float; csource->get_value = priv_gst_interpolation_methods[mode]->get_float;
csource->get_value_array = csource->get_value_array =
interpolation_methods[mode]->get_float_value_array; priv_gst_interpolation_methods[mode]->get_float_value_array;
break; break;
} }
case G_TYPE_DOUBLE:{ case G_TYPE_DOUBLE:{
csource->get_value = interpolation_methods[mode]->get_double; csource->get_value = priv_gst_interpolation_methods[mode]->get_double;
csource->get_value_array = csource->get_value_array =
interpolation_methods[mode]->get_double_value_array; priv_gst_interpolation_methods[mode]->get_double_value_array;
break; break;
} }
case G_TYPE_BOOLEAN:{ case G_TYPE_BOOLEAN:{
csource->get_value = interpolation_methods[mode]->get_boolean; csource->get_value = priv_gst_interpolation_methods[mode]->get_boolean;
csource->get_value_array = csource->get_value_array =
interpolation_methods[mode]->get_boolean_value_array; priv_gst_interpolation_methods[mode]->get_boolean_value_array;
break; break;
} }
case G_TYPE_ENUM:{ case G_TYPE_ENUM:{
csource->get_value = interpolation_methods[mode]->get_enum; csource->get_value = priv_gst_interpolation_methods[mode]->get_enum;
csource->get_value_array = csource->get_value_array =
interpolation_methods[mode]->get_enum_value_array; priv_gst_interpolation_methods[mode]->get_enum_value_array;
break; break;
} }
case G_TYPE_STRING:{ case G_TYPE_STRING:{
csource->get_value = interpolation_methods[mode]->get_string; csource->get_value = priv_gst_interpolation_methods[mode]->get_string;
csource->get_value_array = csource->get_value_array =
interpolation_methods[mode]->get_string_value_array; priv_gst_interpolation_methods[mode]->get_string_value_array;
break; break;
} }
default: default:

3
libs/gst/controller/gstinterpolationcontrolsourceprivate.h
View file

@ -96,5 +96,8 @@ struct _GstInterpolationControlSourcePrivate
gboolean valid_cache; gboolean valid_cache;
}; };
extern GstInterpolateMethod *priv_gst_interpolation_methods[];
extern guint priv_gst_num_interpolation_methods;
#endif /* __GST_INTERPOLATION_CONTROL_SOURCE_PRIVATE_H__ */ #endif /* __GST_INTERPOLATION_CONTROL_SOURCE_PRIVATE_H__ */

1
libs/gst/controller/lib.c
View file

@ -24,6 +24,7 @@
# include "config.h" # include "config.h"
#endif #endif
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/controller/gstcontroller.h>
/* library initialisation */ /* library initialisation */