Changeset 5239:eb474b0b1805 in roaraudio

Timestamp:

11/12/11 17:46:50 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Removed roar_vs_latency().

Files:

• include/libroar/vs.h (modified) (1 diff)
• libroar/vs.c (modified) (2 diffs)
• libroarpulse/simple.c (modified) (1 diff)
• plugins/alsavs/pcm_roar.c (modified) (1 diff)

include/libroar/vs.h

@@ -176 +176 @@
  * ahead of us). This is normal in case we read a stream.
  */
-roar_mus_t roar_vs_latency(roar_vs_t * vss, int backend, int * error) _LIBROAR_VS_STDATTRS _LIBROAR_ATTR_DEPRECATED;
-roar_mus_t roar_vs_latency2(roar_vs_t * vss, int backend, int wait, int * error) _LIBROAR_VS_STDATTRS;
+roar_mus_t roar_vs_latency(roar_vs_t * vss, int backend, int wait, int * error) _LIBROAR_VS_STDATTRS;
 
 /* set pause flag

libroar/vs.c

@@ -870 +870 @@
 #endif
 
-roar_mus_t roar_vs_latency(roar_vs_t * vss, int backend, int * error) {
- return roar_vs_latency2(vss, backend, ROAR_VS_WAIT, error);
-}
-
-roar_mus_t roar_vs_latency2(roar_vs_t * vss, int backend, int wait, int * error) {
+roar_mus_t roar_vs_latency(roar_vs_t * vss, int backend, int wait, int * error) {
  ssize_t pos;
  ssize_t bps;  // byte per sample
@@ -1527 +1523 @@
  if ( vss->async.level == ROAR_VS_ASYNCLEVEL_AUTO && !vss->async.lock &&
       vss->async.read_latency                     && !vss->async.qlen ) {
-  _LIBROAR_IGNORE_RET(roar_vs_latency2(vss,
-                                       vss->async.last_backend < 0 ? ROAR_VS_BACKEND_NONE : vss->async.last_backend,
-                                       ROAR_VS_ASYNC, NULL));
+  _LIBROAR_IGNORE_RET(roar_vs_latency(vss,
+                                      vss->async.last_backend < 0 ? ROAR_VS_BACKEND_NONE : vss->async.last_backend,
+                                      ROAR_VS_ASYNC, NULL));
  }
 

libroarpulse/simple.c

@@ -157 +157 @@
   return -1;
 
- ret = roar_vs_latency((roar_vs_t*)s, ROAR_VS_BACKEND_DEFAULT, &err);
+ ret = roar_vs_latency((roar_vs_t*)s, ROAR_VS_BACKEND_DEFAULT, ROAR_VS_WAIT, &err);
 
  if ( ret < 0 )

plugins/alsavs/pcm_roar.c

@@ -292 +292 @@
  ROAR_DBG("roar_pcm_delay(*) = ?");
 
- lat = roar_vs_latency2(self->vss, ROAR_VS_BACKEND_DEFAULT, ROAR_VS_NOWAIT, NULL);
+ lat = roar_vs_latency(self->vss, ROAR_VS_BACKEND_DEFAULT, ROAR_VS_NOWAIT, NULL);
  *delayp = (lat * self->info.rate) / 1000000;