Changeset 5119:66203ccc8f12 in roaraudio for libroar/vs.c

Timestamp:

08/01/11 12:20:53 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

moved code from roar_vs_latency() into roar_vs_latency2()

File:

• libroar/vs.c (modified) (2 diffs)

libroar/vs.c

@@ -871 +871 @@
 
 roar_mus_t roar_vs_latency(roar_vs_t * vss, int backend, int * error) {
- ssize_t pos  = roar_vs_position(vss, backend, error);
- ssize_t bps;  // byte per sample
- size_t  lioc; // local IO (byte) counter
- size_t  lpos; // local possition
- signed long long int lag;
-
-// printf("pos=%zi\n", pos);
-
- _initerr();
-
- _ckvss(0);
- _ckasync(-1);
-
- if (pos == -1) {
-  _seterrre();
-  return 0;
- }
-
- if ( !(vss->flags & FLAG_STREAM) ) {
-  _seterr(ROAR_ERROR_INVAL);
-  return 0;
- }
-
- if ( vss->writec == 0 ) {
-  lioc = vss->readc;
- } else {
-  //printf("writec=%zu\n", vss->writec);
-  lioc = vss->writec;
- }
-
- bps = roar_info2samplesize(&(vss->info));
-
- if ( bps == -1 ) {
-  _seterrre();
-  return 0;
- }
-
- lpos = (lioc*8) / bps;
-
- //printf("pos=%zi, lpos=%zi, bps=%zi, diff[lpos-pos]=%zi\n", pos, lpos, bps, (lpos - pos));
-
- lag = (signed long long int)lpos - (signed long long int)pos;
- lag /= vss->info.channels;
-
- // we now have the lag in frames
- // return value are mus
- // so we need to multiply with 1s/mus and
- // multiply by 1/rate
-
- lag *= 1000000; // 1s/mus
- lag /= vss->info.rate;
-
- if ( lag == 0 ) {
-  _seterr(ROAR_ERROR_NONE);
- }
-
-#ifdef _HAVE_SOCKOPT
- if (vss->latc.target > vss->latc.minlag) {
-  roar_vs_latency_managed(vss, lag);
- }
-#endif
-
- vss->async.read_latency = 1;
-
- return lag;
+ 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) {
+ ssize_t pos;
  ssize_t bps;  // byte per sample
  size_t  lioc; // local IO (byte) counter
@@ -957 +894 @@
 
  if ( wait == ROAR_VS_WAIT ) {
-  return roar_vs_latency(vss, backend, error);
+  _ckasync(0);
+
+  pos = roar_vs_position(vss, backend, error);
+  if (pos == -1) {
+   _seterrre();
+   return 0;
+  }
+
+  if ( vss->writec == 0 ) {
+   lioc = vss->readc;
+  } else {
+   //printf("writec=%zu\n", vss->writec);
+   lioc = vss->writec;
+  }
+
+  bps = roar_info2samplesize(&(vss->info));
+
+  if ( bps == -1 ) {
+   _seterrre();
+   return 0;
+  }
+
+  lpos = (lioc*8) / bps;
+
+  lag = (signed long long int)lpos - (signed long long int)pos;
+  lag /= vss->info.channels;
+
+  // we now have the lag in frames
+  // return value are mus
+  // so we need to multiply with 1s/mus and
+  // multiply by 1/rate
+
+  lag *= 1000000; // 1s/mus
+  lag /= vss->info.rate;
+
+#ifdef _HAVE_SOCKOPT
+  if (vss->latc.target > vss->latc.minlag) {
+   roar_vs_latency_managed(vss, lag);
+  }
+#endif
+
+  vss->async.read_latency = 1;
+
+  if ( lag == 0 ) {
+   _seterr(ROAR_ERROR_NONE);
+  }
+
+  return lag;
  } else if ( wait == ROAR_VS_NOWAIT ) {
   vss->async.read_latency = 1;