[clutter-gst/wip/separate-logic: 1/2] video-texture: move enums into separate header
- From: Lionel Landwerlin <llandwerlin src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter-gst/wip/separate-logic: 1/2] video-texture: move enums into separate header
- Date: Sun, 21 Aug 2011 01:20:25 +0000 (UTC)
commit 0e258eddf67e9f2b4c38ff59bcf6797178059a26
Author: Lionel Landwerlin <lionel g landwerlin linux intel com>
Date: Sun Aug 21 01:40:03 2011 +0100
video-texture: move enums into separate header
clutter-gst/Makefile.am | 1 +
clutter-gst/clutter-gst-types.h | 65 +++++++++++++++++++++++++++++++
clutter-gst/clutter-gst-video-texture.h | 32 +--------------
3 files changed, 68 insertions(+), 30 deletions(-)
---
diff --git a/clutter-gst/Makefile.am b/clutter-gst/Makefile.am
index 15e4122..e73ce3e 100644
--- a/clutter-gst/Makefile.am
+++ b/clutter-gst/Makefile.am
@@ -22,6 +22,7 @@ include $(top_srcdir)/build/autotools/Makefile.am.marshal
source_h = \
$(srcdir)/clutter-gst.h \
+ $(srcdir)/clutter-gst-types.h \
$(srcdir)/clutter-gst-util.h \
$(srcdir)/clutter-gst-version.h \
$(srcdir)/clutter-gst-video-sink.h \
diff --git a/clutter-gst/clutter-gst-types.h b/clutter-gst/clutter-gst-types.h
new file mode 100644
index 0000000..64a4b19
--- /dev/null
+++ b/clutter-gst/clutter-gst-types.h
@@ -0,0 +1,65 @@
+/*
+ * Clutter-GStreamer.
+ *
+ * GStreamer integration library for Clutter.
+ *
+ * clutter-gst-types.h - Clutter-Gst common types
+ *
+ * Authored By Damien Lespiau <damien lespiau intel com>
+ *
+ * Copyright (C) 2011 Intel Corporation
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#if !defined(__CLUTTER_GST_H_INSIDE__) && !defined(CLUTTER_GST_COMPILATION)
+#error "Only <clutter-gst/clutter-gst.h> can be included directly."
+#endif
+
+#ifndef __CLUTTER_GST_TYPES_H__
+#define __CLUTTER_GST_TYPES_H__
+
+/**
+ * ClutterGstSeekFlags:
+ * @CLUTTER_GST_SEEK_FLAG_NONE: Fast seeks (key frame boundaries, default)
+ * @CLUTTER_GST_SEEK_FLAG_ACCURATE: Accurate seeks (potentially slower)
+ *
+ * Flags that can be given to clutter_gst_video_texture_set_seek_flags().
+ *
+ * Since: 1.4
+ */
+typedef enum _ClutterGstSeekFlags
+{
+ CLUTTER_GST_SEEK_FLAG_NONE = 0,
+ CLUTTER_GST_SEEK_FLAG_ACCURATE = 1 << 0
+} ClutterGstSeekFlags;
+
+/**
+ * ClutterGstBufferingMode:
+ * @CLUTTER_GST_BUFFERING_MODE_STREAM: In-memory buffering
+ * @CLUTTER_GST_BUFFERING_MODE_DOWNLOAD: On-disk buffering
+ *
+ * Different buffering policies clutter-gst supports
+ *
+ * Since: 1.4
+ */
+typedef enum _ClutterGstBufferingMode
+{
+ CLUTTER_GST_BUFFERING_MODE_STREAM,
+ CLUTTER_GST_BUFFERING_MODE_DOWNLOAD
+} ClutterGstBufferingMode;
+
+#endif /* __CLUTTER_GST_TYPES_H__ */
diff --git a/clutter-gst/clutter-gst-video-texture.h b/clutter-gst/clutter-gst-video-texture.h
index 8b3e879..d5878f8 100644
--- a/clutter-gst/clutter-gst-video-texture.h
+++ b/clutter-gst/clutter-gst-video-texture.h
@@ -37,6 +37,8 @@
#include <clutter/clutter.h>
#include <gst/gstelement.h>
+#include <clutter-gst/clutter-gst-types.h>
+
G_BEGIN_DECLS
#define CLUTTER_GST_TYPE_VIDEO_TEXTURE clutter_gst_video_texture_get_type()
@@ -61,36 +63,6 @@ G_BEGIN_DECLS
(G_TYPE_INSTANCE_GET_CLASS ((obj), \
CLUTTER_GST_TYPE_VIDEO_TEXTURE, ClutterGstVideoTextureClass))
-/**
- * ClutterGstSeekFlags:
- * @CLUTTER_GST_SEEK_FLAG_NONE: Fast seeks (key frame boundaries, default)
- * @CLUTTER_GST_SEEK_FLAG_ACCURATE: Accurate seeks (potentially slower)
- *
- * Flags that can be given to clutter_gst_video_texture_set_seek_flags().
- *
- * Since: 1.4
- */
-typedef enum _ClutterGstSeekFlags
-{
- CLUTTER_GST_SEEK_FLAG_NONE = 0,
- CLUTTER_GST_SEEK_FLAG_ACCURATE = 1 << 0
-} ClutterGstSeekFlags;
-
-/**
- * ClutterGstBufferingMode:
- * @CLUTTER_GST_BUFFERING_MODE_STREAM: In-memory buffering
- * @CLUTTER_GST_BUFFERING_MODE_DOWNLOAD: On-disk buffering
- *
- * Different buffering policies clutter-gst supports
- *
- * Since: 1.4
- */
-typedef enum _ClutterGstBufferingMode
-{
- CLUTTER_GST_BUFFERING_MODE_STREAM,
- CLUTTER_GST_BUFFERING_MODE_DOWNLOAD
-} ClutterGstBufferingMode;
-
typedef struct _ClutterGstVideoTexture ClutterGstVideoTexture;
typedef struct _ClutterGstVideoTextureClass ClutterGstVideoTextureClass;
typedef struct _ClutterGstVideoTexturePrivate ClutterGstVideoTexturePrivate;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]