Changeset 5078:2fffe0b6322c in roaraudio

Timestamp:

06/20/11 04:06:09 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added auto mode

Files:

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

include/libroar/vs.h

@@ -313 +313 @@
 typedef enum roar_vs_ctlcmd roar_vs_ctlcmd;
 
+#define ROAR_VS_ASYNCLEVEL_NONE   0
+#define ROAR_VS_ASYNCLEVEL_ENABLE 1
+#define ROAR_VS_ASYNCLEVEL_AUTO   2
+
 int     roar_vs_ctl           (roar_vs_t * vss, roar_vs_ctlcmd cmd, void * argp, int * error);
 

libroar/vs.c

@@ -93 +93 @@
   int qcmd[ASYNC_QLEN];
   int qsubcmd[ASYNC_QLEN];
+  int read_latency;
+  int last_backend;
  } async;
 };
@@ -143 +145 @@
  vss->async.qsubcmd[vss->async.qlen] = subcmd;
  vss->async.qlen++;
+
+ vss->async.read_latency = 0;
 
  return 0;
@@ -270 +274 @@
  vss->latmes.last_pos = -1;
 
+ vss->async.last_backend = ROAR_VS_BACKEND_NONE;
+
  return vss;
 }
@@ -811 +817 @@
  }
 
+ vss->async.last_backend = backend;
 
  if ( backend >= 0 ) {
@@ -924 +931 @@
 #endif
 
+ vss->async.read_latency = 1;
+
  return lag;
 }
@@ -948 +957 @@
   return roar_vs_latency(vss, backend, error);
  } else if ( wait == ROAR_VS_NOWAIT ) {
+  vss->async.read_latency = 1;
+
   if ( vss->latmes.last_pos == -1 ) {
    _seterr(ROAR_ERROR_NODATA);
@@ -1019 +1030 @@
     break;
   }
+
+  vss->async.last_backend = backend;
+
   if ( backend >= 0 )
    if ( _send_async_req(vss, ROAR_CMD_GET_STREAM_PARA, ROAR_STREAM_PARA_INFO, backend, error) == -1 )
@@ -1521 +1535 @@
    }
   }
+ }
+
+ if ( vss->async.level == ROAR_VS_ASYNCLEVEL_AUTO && !vss->async.lock &&
+      vss->async.read_latency                     && !vss->async.qlen ) {
+  roar_vs_latency2(vss, vss->async.last_backend < 0 ? ROAR_VS_BACKEND_NONE : vss->async.last_backend, ROAR_VS_ASYNC, NULL);
  }