Changeset 4637:f50df7324ec1 in roaraudio

Timestamp:

12/01/10 17:04:04 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

support non-symbolic backends

Files:

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

ChangeLog

@@ -1 +1 @@
 v. 0.4beta2 - ?
         * Announce standards via OpenSLP (Closes: #5)
-        * Updated VS API (Closes: #54, #3, #2)
+        * Updated VS API (Closes: #54, #3, #2, #99)
         * Added support for CRC24 (RFC 4880)
         * Added Base64 support.

libroar/vs.c

@@ -603 +603 @@
  struct roar_stream      out_stream;
  struct roar_stream_info out_info;
- size_t offset;
+ size_t offset = 0;
 
  _ckvss(-1);
@@ -624 +624 @@
    break;
   case ROAR_VS_BACKEND_FIRST:
-   // _roar_vs_find_first_prim(vss);
     if ( vss->first_primid == -1 ) {
      _seterr(ROAR_ERROR_UNKNOWN);
@@ -630 +629 @@
     }
 
-    roar_stream_new_by_id(&out_stream, vss->first_primid);
-
-    if ( roar_stream_get_info(vss->con, &out_stream, &out_info) == -1 ) {
-     _seterrre();
+    backend = vss->first_primid;
+   break;
+  default:
+    if ( backend < 0 ) {
+     _seterr(ROAR_ERROR_INVAL);
      return -1;
     }
-
-    offset  = out_info.delay * vss->info.rate;
-    offset /= 1000000;
-
-    return stream.pos + offset;
-   break;
-  default:
-    _seterr(ROAR_ERROR_NOTSUP);
-    return -1;
-   break;
- }
-
- _seterr(ROAR_ERROR_NOSYS);
- return -1;
+   break;
+ }
+
+
+ if ( backend >= 0 ) {
+  roar_stream_new_by_id(&out_stream, backend);
+
+  if ( roar_stream_get_info(vss->con, &out_stream, &out_info) == -1 ) {
+   _seterrre();
+   return -1;
+  }
+
+  offset  = out_info.delay * vss->info.rate;
+  offset /= 1000000;
+ }
+
+ return stream.pos + offset;
 }