Changeset 4193:024769a1636b in roaraudio

Timestamp:

08/15/10 02:22:09 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

fixed rsd bug with long running streams

Files:

• ChangeLog (modified) (1 diff)
• roard/emul_rsound.c (modified) (3 diffs)

ChangeLog

@@ -6 +6 @@
         * Updated Debian init script
         * Added VS API
+        * Fixed strange bug in RSound emulation killing streams
+          after long time.
 
 v. 0.3beta7 - Fri Jul 23 2010 15:11 CEST

roard/emul_rsound.c

@@ -145 +145 @@
 
 int emul_rsound_vrecv_msg(struct emul_rsound_msg * msg, struct roar_vio_calls * vio) {
+ struct roar_vio_select select;
+ struct roar_vio_selecttv tv = {
+  .sec  = 0,
+  .nsec = 0
+ };
  ssize_t ret;
  int     num;
@@ -150 +155 @@
  if ( msg == NULL || vio == NULL )
   return -1;
+
+ ROAR_VIO_SELECT_SETVIO(&select, vio, ROAR_VIO_SELECT_READ); 
+ if ( roar_vio_select(&select, 1, &tv, NULL) == -1 )
+  return -1;
+
+ if ( !(select.eventsa & ROAR_VIO_SELECT_READ) ) {
+  errno = EAGAIN;
+  return -1;
+ }
 
  ret = roar_vio_read(vio, msg->header, EMUL_RSOUND_MSG_HEADER_LEN);
@@ -188 +202 @@
 
 int emul_rsound_vsend_msg(struct emul_rsound_msg * msg, struct roar_vio_calls * vio) {
+ struct roar_vio_select select;
+ struct roar_vio_selecttv tv = {
+  .sec = 0,
+  .nsec = 0
+ };
  ssize_t ret;
 
  if ( msg == NULL || vio == NULL )
   return -1;
+
+ ROAR_VIO_SELECT_SETVIO(&select, vio, ROAR_VIO_SELECT_WRITE); 
+ if ( roar_vio_select(&select, 1, &tv, NULL) == -1 )
+  return -1;
+
+ if ( !(select.eventsa & ROAR_VIO_SELECT_WRITE) ) {
+  errno = EAGAIN;
+  return -1;
+ }
 
  snprintf(msg->header, EMUL_RSOUND_MSG_HEADER_LEN+1, "RSD%5d", (int)msg->datalen);