Changeset 4579:d6f55bf4b6d4 in roaraudio

Timestamp:

11/03/10 04:01:03 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added support for ROAR_VS_WAIT (Closes: #54)

Files:

• ChangeLog (modified) (1 diff)
• libroar/vs.c (modified) (2 diffs)

ChangeLog

@@ -1 +1 @@
 v. 0.4beta2 - ?
         * Announce standards via OpenSLP (Closes: #5)
+        * Updated VS API (Closes: #54)
 
 v. 0.4beta1 - Mon Nov 01 2010 16:14 CET

libroar/vs.c

@@ -281 +281 @@
 
 int     roar_vs_sync (roar_vs_t * vss, int wait, int * error) {
- _ckvss(-1);
-
- if ( !(vss->flags & FLAG_STREAM) ) {
-  _seterr(ROAR_ERROR_INVAL);
-  return -1;
- }
-
- if ( wait != ROAR_VS_NOWAIT ) {
+ struct roar_event waits, triggered;
+
+ _ckvss(-1);
+
+ if ( !(vss->flags & FLAG_STREAM) ) {
+  _seterr(ROAR_ERROR_INVAL);
+  return -1;
+ }
+
+ if ( wait != ROAR_VS_NOWAIT && wait != ROAR_VS_WAIT ) {
   _seterr(ROAR_ERROR_INVAL);
   return -1;
@@ -298 +300 @@
   _seterrre();
   return -1;
+ }
+
+ if ( wait == ROAR_VS_WAIT ) {
+  memset(&waits, 0, sizeof(waits));
+  waits.event       = ROAR_OE_STREAM_XRUN;
+  waits.emitter     = -1;
+  waits.target      = roar_stream_get_id(&(vss->stream));
+  waits.target_type = ROAR_OT_STREAM;
+
+  if ( roar_wait(vss->con, &triggered, &waits, 1) == -1 ) {
+   _seterrre();
+   return -1;
+  }
  }