Merge remote branch 'origin/master' into dexela

Conflicts:
	CMakeLists.txt
	src/CMakeLists.txt
	src/uca-camera.c

1 files changed, 28 insertions, 0 deletions

diff --git a/tools/gui/ring-buffer.h b/tools/gui/ring-buffer.h
new file mode 100644
index 0000000..9966eb7
--- /dev/null
+++ b/tools/gui/ring-buffer.h
@@ -0,0 +1,28 @@
+#ifndef RING_BUFFER_H
+#define RING_BUFFER_H
+
+#include <glib.h>
+
+G_BEGIN_DECLS
+
+typedef struct {
+    guchar  *data;
+    gsize    block_size;
+    guint    n_blocks_total;
+    guint    n_blocks_used;
+    guint    current_index;
+} RingBuffer;
+
+RingBuffer * ring_buffer_new                  (gsize       block_size,
+                                               gsize       n_blocks);
+void         ring_buffer_free                 (RingBuffer *buffer);
+void         ring_buffer_reset                (RingBuffer *buffer);
+gpointer     ring_buffer_get_current_pointer  (RingBuffer *buffer);
+gpointer     ring_buffer_get_pointer          (RingBuffer *buffer,
+                                               guint       index);
+guint        ring_buffer_get_num_blocks       (RingBuffer *buffer);
+void         ring_buffer_proceed              (RingBuffer *buffer);
+
+G_END_DECLS
+
+#endif