gstclock.h		gstclock.h
	skipping to change at line 237		skipping to change at line 237
	/**		/**
	* GST_CLOCK_ENTRY_TRACE_NAME:		* GST_CLOCK_ENTRY_TRACE_NAME:
	*		*
	* The name used for tracing clock entry allocations.		* The name used for tracing clock entry allocations.
	*/		*/
	#define GST_CLOCK_ENTRY_TRACE_NAME "GstClockEntry"		#define GST_CLOCK_ENTRY_TRACE_NAME "GstClockEntry"
	typedef struct _GstClockEntry GstClockEntry;		typedef struct _GstClockEntry GstClockEntry;
	typedef struct _GstClock GstClock;		typedef struct _GstClock GstClock;
	typedef struct _GstClockClass GstClockClass;		typedef struct _GstClockClass GstClockClass;
			typedef struct _GstClockPrivate GstClockPrivate;
	/* --- prototype for async callbacks --- */		/* --- prototype for async callbacks --- */
	/**		/**
	* GstClockCallback:		* GstClockCallback:
	* @clock: The clock that triggered the callback		* @clock: The clock that triggered the callback
	* @time: The time it was triggered		* @time: The time it was triggered
	* @id: The #GstClockID that expired		* @id: The #GstClockID that expired
	* @user_data: user data passed in the gst_clock_id_wait_async() function		* @user_data: user data passed in the gst_clock_id_wait_async() function
	*		*
	* The function prototype of the callback.		* The function prototype of the callback.
	skipping to change at line 261		skipping to change at line 262
	GstClockID id, gpointer use r_data);		GstClockID id, gpointer use r_data);
	/**		/**
	* GstClockReturn:		* GstClockReturn:
	* @GST_CLOCK_OK: The operation succeeded.		* @GST_CLOCK_OK: The operation succeeded.
	* @GST_CLOCK_EARLY: The operation was scheduled too late.		* @GST_CLOCK_EARLY: The operation was scheduled too late.
	* @GST_CLOCK_UNSCHEDULED: The clockID was unscheduled		* @GST_CLOCK_UNSCHEDULED: The clockID was unscheduled
	* @GST_CLOCK_BUSY: The ClockID is busy		* @GST_CLOCK_BUSY: The ClockID is busy
	* @GST_CLOCK_BADTIME: A bad time was provided to a function.		* @GST_CLOCK_BADTIME: A bad time was provided to a function.
	* @GST_CLOCK_ERROR: An error occurred		* @GST_CLOCK_ERROR: An error occurred
	* @GST_CLOCK_UNSUPPORTED: Operation is not supported		* @GST_CLOCK_UNSUPPORTED: Operation is not supported
			* @GST_CLOCK_DONE: The ClockID is done waiting
	*		*
	* The return value of a clock operation.		* The return value of a clock operation.
	*/		*/
	typedef enum		typedef enum
	{		{
	GST_CLOCK_OK = 0,		GST_CLOCK_OK = 0,
	GST_CLOCK_EARLY = 1,		GST_CLOCK_EARLY = 1,
	GST_CLOCK_UNSCHEDULED = 2,		GST_CLOCK_UNSCHEDULED = 2,
	GST_CLOCK_BUSY = 3,		GST_CLOCK_BUSY = 3,
	GST_CLOCK_BADTIME = 4,		GST_CLOCK_BADTIME = 4,
	GST_CLOCK_ERROR = 5,		GST_CLOCK_ERROR = 5,
	GST_CLOCK_UNSUPPORTED = 6		GST_CLOCK_UNSUPPORTED = 6,
			GST_CLOCK_DONE = 7
	} GstClockReturn;		} GstClockReturn;
	/**		/**
	* GstClockEntryType:		* GstClockEntryType:
	* @GST_CLOCK_ENTRY_SINGLE: a single shot timeout		* @GST_CLOCK_ENTRY_SINGLE: a single shot timeout
	* @GST_CLOCK_ENTRY_PERIODIC: a periodic timeout request		* @GST_CLOCK_ENTRY_PERIODIC: a periodic timeout request
	*		*
	* The type of the clock entry		* The type of the clock entry
	*/		*/
	typedef enum {		typedef enum {
	skipping to change at line 336		skipping to change at line 339
	* The status of the entry		* The status of the entry
	*/		*/
	#define GST_CLOCK_ENTRY_STATUS(entry) ((entry)->status)		#define GST_CLOCK_ENTRY_STATUS(entry) ((entry)->status)
	/**		/**
	* GstClockEntry:		* GstClockEntry:
	* @refcount: reference counter (read-only)		* @refcount: reference counter (read-only)
	*		*
	* All pending timeouts or periodic notifies are converted into		* All pending timeouts or periodic notifies are converted into
	* an entry.		* an entry.
			* Note that GstClockEntry should be treated as an opaque structure. It mus
			t
			* not be extended or allocated using a custom allocator.
	*/		*/
	struct _GstClockEntry {		struct _GstClockEntry {
	gint refcount;		gint refcount;
	/*< protected >*/		/*< protected >*/
	GstClock *clock;		GstClock *clock;
	GstClockEntryType type;		GstClockEntryType type;
	GstClockTime time;		GstClockTime time;
	GstClockTime interval;		GstClockTime interval;
	GstClockReturn status;		GstClockReturn status;
	GstClockCallback func;		GstClockCallback func;
	gpointer user_data;		gpointer user_data;
			GDestroyNotify destroy_data;
			gboolean unscheduled;
			gboolean woken_up;
	};		};
	/**		/**
	* GstClockFlags:		* GstClockFlags:
	* @GST_CLOCK_FLAG_CAN_DO_SINGLE_SYNC: clock can do a single sync timeout r equest		* @GST_CLOCK_FLAG_CAN_DO_SINGLE_SYNC: clock can do a single sync timeout r equest
	* @GST_CLOCK_FLAG_CAN_DO_SINGLE_ASYNC: clock can do a single async timeout request		* @GST_CLOCK_FLAG_CAN_DO_SINGLE_ASYNC: clock can do a single async timeout request
	* @GST_CLOCK_FLAG_CAN_DO_PERIODIC_SYNC: clock can do sync periodic timeout requests		* @GST_CLOCK_FLAG_CAN_DO_PERIODIC_SYNC: clock can do sync periodic timeout requests
	* @GST_CLOCK_FLAG_CAN_DO_PERIODIC_ASYNC: clock can do async periodic timeo ut callbacks		* @GST_CLOCK_FLAG_CAN_DO_PERIODIC_ASYNC: clock can do async periodic timeo ut callbacks
	* @GST_CLOCK_FLAG_CAN_SET_RESOLUTION: clock's resolution can be changed		* @GST_CLOCK_FLAG_CAN_SET_RESOLUTION: clock's resolution can be changed
	* @GST_CLOCK_FLAG_CAN_SET_MASTER: clock can be slaved to a master clock		* @GST_CLOCK_FLAG_CAN_SET_MASTER: clock can be slaved to a master clock
	skipping to change at line 449		skipping to change at line 457
	/* with SLAVE_LOCK */		/* with SLAVE_LOCK */
	gboolean filling;		gboolean filling;
	gint window_size;		gint window_size;
	gint window_threshold;		gint window_threshold;
	gint time_index;		gint time_index;
	GstClockTime timeout;		GstClockTime timeout;
	GstClockTime *times;		GstClockTime *times;
	GstClockID clockid;		GstClockID clockid;
	/*< private >*/		/*< private >*/
	GstClockTime _gst_reserved[GST_PADDING];		union {
			GstClockPrivate *priv;
			GstClockTime _gst_reserved[GST_PADDING];
			} ABI;
	};		};
	/**		/**
	* GstClockClass:		* GstClockClass:
	* @parent_class: the parent class structure		* @parent_class: the parent class structure
	* @change_resolution: change the resolution of the clock. Not all values m ight		* @change_resolution: change the resolution of the clock. Not all values m ight
	* be acceptable. The new resolution should be returned .		* be acceptable. The new resolution should be returned .
	* @get_resolution: get the resolution of the clock.		* @get_resolution: get the resolution of the clock.
	* @get_internal_time: get the internal unadjusted time of the clock.		* @get_internal_time: get the internal unadjusted time of the clock.
	* @wait: perform a blocking wait for the given #GstClockEntry. Deprecated,		* @wait: perform a blocking wait for the given #GstClockEntry. Deprecated,
	skipping to change at line 540		skipping to change at line 551
	/* operations on IDs */		/* operations on IDs */
	gint gst_clock_id_compare_func (gconstpointer id1, gconstpointer id2);		gint gst_clock_id_compare_func (gconstpointer id1, gconstpointer id2);
	GstClockTime gst_clock_id_get_time (GstClockID id);		GstClockTime gst_clock_id_get_time (GstClockID id);
	GstClockReturn gst_clock_id_wait (GstClockID id,		GstClockReturn gst_clock_id_wait (GstClockID id,
	GstClockTimeDiff *j itter);		GstClockTimeDiff *j itter);
	GstClockReturn gst_clock_id_wait_async (GstClockID id,		GstClockReturn gst_clock_id_wait_async (GstClockID id,
	GstClockCallback fu nc,		GstClockCallback fu nc,
	gpointer user_data) ;		gpointer user_data) ;
			GstClockReturn gst_clock_id_wait_async_full (GstClockID id,
			GstClockCallback fu
			nc,
			gpointer user_data,
			GDestroyNotify dest
			roy_data);
	void gst_clock_id_unschedule (GstClockID id);		void gst_clock_id_unschedule (GstClockID id);
			gboolean gst_clock_single_shot_id_reinit (GstClock * clock,
			GstClockID id,
			GstClockTime time);
	G_END_DECLS		G_END_DECLS
	#endif /* __GST_CLOCK_H__ */		#endif /* __GST_CLOCK_H__ */
End of changes. 8 change blocks.
	2 lines changed or deleted		24 lines changed or added
This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/