Changeset 3869:c63e1367041c in roaraudio for libroar/basic.c

Timestamp:

05/19/10 22:14:22 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

fixed long outstanding Con vs. VIO bug

File:

• libroar/basic.c (modified) (6 diffs)

libroar/basic.c

@@ -231 +231 @@
  memset(con, 0, sizeof(struct roar_connection));
 
- con->__fh = fh;
+ con->flags = ROAR_CON_FLAGS_FH;
+ con->__fh  = fh;
+
+ if ( roar_vio_open_fh_socket(&(con->viocon), fh) != -1 )
+  con->flags |= ROAR_CON_FLAGS_VIO;
 
  roar_errno = ROAR_ERROR_NONE;
@@ -238 +242 @@
 
 int roar_get_connection_fh (struct roar_connection * con) {
- roar_debug_warn_sysio("roar_get_connection_fh", "roar_get_connection_vio", NULL);
+ roar_debug_warn_sysio("roar_get_connection_fh", "roar_get_connection_vio2", NULL);
 
  if ( con == NULL )
   return -1;
 
+ if ( !(con->flags & ROAR_CON_FLAGS_FH) )
+  return -1;
+
  return con->__fh;
 }
 
 int roar_get_connection_vio (struct roar_connection * con, struct roar_vio_calls * vio) {
+ roar_debug_warn_obsolete("roar_get_connection_vio", "roar_get_connection_vio2", NULL);
+
  if ( con == NULL || vio == NULL )
   return -1;
 
+ if ( !(con->flags & ROAR_CON_FLAGS_FH) )
+  return -1;
+
  return roar_vio_open_fh_socket(vio, con->__fh);
 }
 
+struct roar_vio_calls * roar_get_connection_vio2 (struct roar_connection * con) {
+ if ( con == NULL )
+  return NULL;
+
+ if ( con->flags & ROAR_CON_FLAGS_VIO )
+  return &(con->viocon);
+
+// TODO: try to open the VIO.
+
+ return NULL;
+}
+
 int roar_disconnect (struct roar_connection * con) {
- struct roar_vio_calls vio;
+ struct roar_vio_calls * vio;
  struct roar_message m;
 
@@ -264 +288 @@
  roar_req(con, &m, NULL);
 
- if ( roar_get_connection_vio(con, &vio) != -1 ) {
-  roar_vio_close(&vio);
+ if ( (vio = roar_get_connection_vio2(con)) != NULL ) {
+  roar_vio_close(vio);
  }
 
@@ -329 +353 @@
 #define _ROAR_MESS_BUF_LEN (1 /* version */ + 1 /* cmd */ + 2 /* stream */ + 4 /* pos */ + 2 /* datalen */)
 int roar_send_message (struct roar_connection * con, struct roar_message * mes, char * data) {
- struct roar_vio_calls vio;
-
- if ( roar_get_connection_vio(con, &vio) == -1 )
-  return -1;
-
- return roar_vsend_message(&vio, mes, data);
+ struct roar_vio_calls * vio;
+
+ if ( (vio = roar_get_connection_vio2(con)) == NULL )
+  return -1;
+
+ return roar_vsend_message(vio, mes, data);
 }
 
@@ -369 +393 @@
 
 int roar_recv_message (struct roar_connection * con, struct roar_message * mes, char ** data) {
- struct roar_vio_calls vio;
-
- if ( roar_get_connection_vio(con, &vio) == -1 )
-  return -1;
-
- return roar_vrecv_message(&vio, mes, data);
+ struct roar_vio_calls * vio;
+
+ if ( (vio = roar_get_connection_vio2(con)) == NULL )
+  return -1;
+
+ return roar_vrecv_message(vio, mes, data);
 }
 
@@ -464 +488 @@
 
 int roar_req (struct roar_connection * con, struct roar_message * mes, char ** data) {
- struct roar_vio_calls vio;
-
- if ( roar_get_connection_vio(con, &vio) == -1 )
-  return -1;
-
- return roar_vreq(&vio, mes, data);
+ struct roar_vio_calls * vio;
+
+ if ( (vio = roar_get_connection_vio2(con)) == NULL )
+  return -1;
+
+ return roar_vreq(vio, mes, data);
 }