[cogl/wip/frame-synchronization] Clean up Since: and Stability: for frame-info additions



commit bea62057d5f863e0a420c4921998b096b6ffb5c9
Author: Owen W. Taylor <otaylor fishsoup net>
Date:   Mon Jan 28 12:40:53 2013 -0500

    Clean up Since: and Stability: for frame-info additions
    
    Consistently use Since: 1.14 Stability: Unstable for CoglFrameInfo
    related additions, also guard cogl-output.h and cogl-frame-info.h
    with COGL_ENABLE_EXPERIMENTAL_API.

 cogl/cogl-frame-info.h |   15 ++++++++-------
 cogl/cogl-onscreen.h   |    3 ++-
 cogl/cogl-output.h     |    4 ++++
 cogl/cogl.h            |    1 +
 4 files changed, 15 insertions(+), 8 deletions(-)
---
diff --git a/cogl/cogl-frame-info.h b/cogl/cogl-frame-info.h
index 1f5de5f..5587862 100644
--- a/cogl/cogl-frame-info.h
+++ b/cogl/cogl-frame-info.h
@@ -37,6 +37,8 @@
 
 G_BEGIN_DECLS
 
+#ifdef COGL_ENABLE_EXPERIMENTAL_API
+
 typedef struct _CoglFrameInfo CoglFrameInfo;
 #define COGL_FRAME_INFO(X) ((CoglFrameInfo *)(X))
 
@@ -62,7 +64,7 @@ cogl_is_frame_info (void *object);
  * to this frame.
  *
  * Return value: The frame counter value
- * Since: 2.0
+ * Since: 1.14
  * Stability: unstable
  */
 int64_t cogl_frame_info_get_frame_counter (CoglFrameInfo *info);
@@ -86,7 +88,7 @@ int64_t cogl_frame_info_get_frame_counter (CoglFrameInfo *info);
  * incorrectly report non-monotonic timestamps.</note>
  *
  * Return value: the presentation time for the frame
- * Since: 2.0
+ * Since: 1.14
  * Stability: unstable
  */
 int64_t cogl_frame_info_get_presentation_time (CoglFrameInfo *info);
@@ -105,7 +107,7 @@ int64_t cogl_frame_info_get_presentation_time (CoglFrameInfo *info);
  * cogl_output_get_refresh_rate().</note>
  *
  * Return value: the refresh rate in Hertz
- * Since: 2.0
+ * Since: 1.14
  * Stability: unstable
  */
 int64_t cogl_frame_info_get_refresh_rate (CoglFrameInfo *info);
@@ -118,15 +120,14 @@ int64_t cogl_frame_info_get_refresh_rate (CoglFrameInfo *info);
  *
  * Return value: The #CoglOutput that the frame was presented to, or
  *               %NULL if this could not be determined.
- * Since: 2.0
+ * Since: 1.14
  * Stability: unstable
  */
 CoglOutput *
 cogl_frame_info_get_output (CoglFrameInfo *info);
 
+#endif /* COGL_ENABLE_EXPERIMENTAL_API */
+
 G_END_DECLS
 
 #endif /* __COGL_FRAME_INFO_H */
-
-
-
diff --git a/cogl/cogl-onscreen.h b/cogl/cogl-onscreen.h
index 9ce5cd2..a940cf6 100644
--- a/cogl/cogl-onscreen.h
+++ b/cogl/cogl-onscreen.h
@@ -688,7 +688,8 @@ cogl_is_onscreen (void *object);
  * is called.
  *
  * Return value: the current frame counter value
- * Since: 2.0
+ * Since: 1.14
+ * Stability: unstable
  */
 int64_t
 cogl_onscreen_get_frame_counter (CoglOnscreen *onscreen);
diff --git a/cogl/cogl-output.h b/cogl/cogl-output.h
index cf2d31b..168554d 100644
--- a/cogl/cogl-output.h
+++ b/cogl/cogl-output.h
@@ -36,6 +36,8 @@
 
 G_BEGIN_DECLS
 
+#ifdef COGL_ENABLE_EXPERIMENTAL_API
+
 /**
  * SECTION:cogl-output
  * @short_description: information about an output device
@@ -235,6 +237,8 @@ cogl_output_get_subpixel_order (CoglOutput *output);
 float
 cogl_output_get_refresh_rate (CoglOutput *output);
 
+#endif /* COGL_ENABLE_EXPERIMENTAL_API */
+
 G_END_DECLS
 
 #endif /* __COGL_OUTPUT_H */
diff --git a/cogl/cogl.h b/cogl/cogl.h
index f8b010c..72be57d 100644
--- a/cogl/cogl.h
+++ b/cogl/cogl.h
@@ -105,6 +105,7 @@
 #include <cogl/cogl-snippet.h>
 #include <cogl/cogl-framebuffer.h>
 #include <cogl/cogl-onscreen.h>
+#include <cogl/cogl-frame-info.h>
 #include <cogl/cogl-poll.h>
 #if defined (COGL_HAS_EGL_PLATFORM_KMS_SUPPORT)
 #include <cogl/cogl-kms-renderer.h>



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]