projects
/
platform
/
upstream
/
gstreamer.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
device: Enforce that elements created by gst_device_create_element() are floating
[platform/upstream/gstreamer.git]
/
gst
/
gstsystemclock.h
diff --git
a/gst/gstsystemclock.h
b/gst/gstsystemclock.h
index
490f700
..
585afb8
100644
(file)
--- a/
gst/gstsystemclock.h
+++ b/
gst/gstsystemclock.h
@@
-17,8
+17,8
@@
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
*
* 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., 5
9 Temple Place - Suite 330
,
- * Boston, MA 0211
1-1307
, USA.
+ * Free Software Foundation, Inc., 5
1 Franklin St, Fifth Floor
,
+ * Boston, MA 0211
0-1301
, USA.
*/
*/
@@
-47,12
+47,14
@@
typedef struct _GstSystemClockPrivate GstSystemClockPrivate;
* @GST_CLOCK_TYPE_REALTIME: time since Epoch
* @GST_CLOCK_TYPE_MONOTONIC: monotonic time since some unspecified starting
* point
* @GST_CLOCK_TYPE_REALTIME: time since Epoch
* @GST_CLOCK_TYPE_MONOTONIC: monotonic time since some unspecified starting
* point
+ * @GST_CLOCK_TYPE_OTHER: some other time source is used (Since: 1.0.5)
*
* The different kind of clocks.
*/
typedef enum {
GST_CLOCK_TYPE_REALTIME = 0,
*
* The different kind of clocks.
*/
typedef enum {
GST_CLOCK_TYPE_REALTIME = 0,
- GST_CLOCK_TYPE_MONOTONIC = 1
+ GST_CLOCK_TYPE_MONOTONIC = 1,
+ GST_CLOCK_TYPE_OTHER = 2
} GstClockType;
/**
} GstClockType;
/**
@@
-64,10
+66,6
@@
struct _GstSystemClock {
GstClock clock;
/*< private >*/
GstClock clock;
/*< private >*/
- GThread *thread; /* thread for async notify */
- gboolean stopping;
-
- /* ABI added */
GstSystemClockPrivate *priv;
gpointer _gst_reserved[GST_PADDING];
GstSystemClockPrivate *priv;
gpointer _gst_reserved[GST_PADDING];
@@
-80,10
+78,19
@@
struct _GstSystemClockClass {
gpointer _gst_reserved[GST_PADDING];
};
gpointer _gst_reserved[GST_PADDING];
};
+GST_API
GType gst_system_clock_get_type (void);
GType gst_system_clock_get_type (void);
+GST_API
GstClock* gst_system_clock_obtain (void);
GstClock* gst_system_clock_obtain (void);
+GST_API
+void gst_system_clock_set_default (GstClock *new_clock);
+
+#ifdef G_DEFINE_AUTOPTR_CLEANUP_FUNC
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstSystemClock, gst_object_unref)
+#endif
+
G_END_DECLS
#endif /* __GST_SYSTEM_CLOCK_H__ */
G_END_DECLS
#endif /* __GST_SYSTEM_CLOCK_H__ */