pad: clean up the .h file a bit

This commit is contained in:
Wim Taymans 2011-05-06 12:09:00 +02:00
parent 4372869e80
commit 0637aa95c5

View file

@ -558,7 +558,6 @@ typedef struct _GstPadTemplate GstPadTemplate;
* @linkfunc: function called when pad is linked * @linkfunc: function called when pad is linked
* @unlinkfunc: function called when pad is unlinked * @unlinkfunc: function called when pad is unlinked
* @peer: the pad this pad is linked to * @peer: the pad this pad is linked to
* @sched_private: private storage for the scheduler
* @chainfunc: function to chain buffer to pad * @chainfunc: function to chain buffer to pad
* @checkgetrangefunc: function to check if pad can operate in pull mode * @checkgetrangefunc: function to check if pad can operate in pull mode
* @getrangefunc: function to get a range of data from a pad * @getrangefunc: function to get a range of data from a pad
@ -575,14 +574,14 @@ typedef struct _GstPadTemplate GstPadTemplate;
* The #GstPad structure. Use the functions to update the variables. * The #GstPad structure. Use the functions to update the variables.
*/ */
struct _GstPad { struct _GstPad {
GstObject object; GstObject object;
/*< public >*/ /*< public >*/
gpointer element_private; gpointer element_private;
GstPadTemplate *padtemplate; GstPadTemplate *padtemplate;
GstPadDirection direction; GstPadDirection direction;
/*< public >*/ /* with STREAM_LOCK */ /*< public >*/ /* with STREAM_LOCK */
/* streaming rec_lock */ /* streaming rec_lock */
@ -604,16 +603,15 @@ struct _GstPad {
GstPadAcceptCapsFunction acceptcapsfunc; GstPadAcceptCapsFunction acceptcapsfunc;
GstPadFixateCapsFunction fixatecapsfunc; GstPadFixateCapsFunction fixatecapsfunc;
GstActivateMode mode;
GstPadActivateFunction activatefunc; GstPadActivateFunction activatefunc;
GstPadActivateModeFunction activatepushfunc; GstPadActivateModeFunction activatepushfunc;
GstPadActivateModeFunction activatepullfunc; GstPadActivateModeFunction activatepullfunc;
/* pad link */ /* pad link */
GstPad *peer;
GstPadLinkFunction linkfunc; GstPadLinkFunction linkfunc;
GstPadUnlinkFunction unlinkfunc; GstPadUnlinkFunction unlinkfunc;
GstPad *peer;
gpointer sched_private;
/* data transport functions */ /* data transport functions */
GstPadChainFunction chainfunc; GstPadChainFunction chainfunc;
@ -622,8 +620,6 @@ struct _GstPad {
GstPadGetRangeFunction getrangefunc; GstPadGetRangeFunction getrangefunc;
GstPadEventFunction eventfunc; GstPadEventFunction eventfunc;
GstActivateMode mode;
/* generic query method */ /* generic query method */
GstPadQueryTypeFunction querytypefunc; GstPadQueryTypeFunction querytypefunc;
GstPadQueryFunction queryfunc; GstPadQueryFunction queryfunc;
@ -660,7 +656,7 @@ struct _GstPadClass {
/* GstPad */ /* GstPad */
#define GST_PAD_NAME(pad) (GST_OBJECT_NAME(pad)) #define GST_PAD_NAME(pad) (GST_OBJECT_NAME(pad))
#define GST_PAD_PARENT(pad) (GST_ELEMENT_CAST(GST_OBJECT_PARENT(pad))) #define GST_PAD_PARENT(pad) (GST_ELEMENT_CAST(GST_OBJECT_PARENT(pad)))
#define GST_PAD_ELEMENT_PRIVATE(pad) (GST_PAD_CAST(pad)->element_private) #define GST_PAD_ELEMENT_PRIVATE(pad) (GST_PAD_CAST(pad)->element_private)
#define GST_PAD_PAD_TEMPLATE(pad) (GST_PAD_CAST(pad)->padtemplate) #define GST_PAD_PAD_TEMPLATE(pad) (GST_PAD_CAST(pad)->padtemplate)
#define GST_PAD_DIRECTION(pad) (GST_PAD_CAST(pad)->direction) #define GST_PAD_DIRECTION(pad) (GST_PAD_CAST(pad)->direction)
#define GST_PAD_TASK(pad) (GST_PAD_CAST(pad)->task) #define GST_PAD_TASK(pad) (GST_PAD_CAST(pad)->task)