Changeset 4629:27acd1cc7e9c in roaraudio

Timestamp:

11/27/10 16:29:18 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

support to reset buffer

Files:

• include/libroar/buffer.h (modified) (1 diff)
• include/libroar/vs.h (modified) (1 diff)
• libroar/buffer.c (modified) (1 diff)
• libroar/vs.c (modified) (1 diff)

include/libroar/buffer.h

@@ -101 +101 @@
 int roar_buffer_ring_avail(struct roar_buffer *  buf, size_t * readlen, size_t * writelen);
 
+int roar_buffer_ring_reset(struct roar_buffer *  buf);
+
 #endif
 

include/libroar/vs.h

@@ -234 +234 @@
 ssize_t roar_vs_get_avail_write(roar_vs_t * vss, int * error);
 
+int     roar_vs_reset_buffer(roar_vs_t * vss, int writering, int readring, int * error);
+
 /* Misc controls.
  */

libroar/buffer.c

@@ -729 +729 @@
 }
 
+int roar_buffer_ring_reset(struct roar_buffer *  buf) {
+ if ( buf == NULL )
+  return -1;
+
+ if ( !(buf->flags & ROAR_BUFFER_FLAG_RING) )
+  return -1;
+
+ buf->meta.ring.read_pos = buf->meta.ring.write_pos = 0;
+
+ return 0;
+}
+
 //ll

libroar/vs.c

@@ -1238 +1238 @@
 }
 
+int     roar_vs_reset_buffer(roar_vs_t * vss, int writering, int readring, int * error) {
+ _ckvss(-1);
+
+ if ( !(vss->flags & FLAG_BUFFERED) ) {
+  _seterr(ROAR_ERROR_INVAL);
+  return -1;
+ }
+
+ if ( writering != ROAR_VS_TRUE || writering != ROAR_VS_FALSE ||
+      readring  != ROAR_VS_TRUE || readring  != ROAR_VS_FALSE ) {
+  _seterr(ROAR_ERROR_INVAL);
+  return -1;
+ }
+
+ if ( writering ) {
+  if ( roar_buffer_ring_reset(vss->writering) == -1 ) {
+   _seterrre();
+   return -1;
+  }
+ }
+
+ if ( readring ) {
+  if ( roar_buffer_ring_reset(vss->readring) == -1 ) {
+   _seterrre();
+   return -1;
+  }
+ }
+
+ return 0;
+}
+
 int     roar_vs_ctl           (roar_vs_t * vss, roar_vs_ctlcmd cmd, void * argp, int * error) {
  _ckvss(-1);