Changeset 2809:8d51fb4545cb in roaraudio

Timestamp:

09/29/09 17:55:58 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

sysio -> vio api, added warnings

Location:

libroar

Files:

• basic.c (modified) (6 diffs)
• simple.c (modified) (1 diff)

libroar/basic.c

@@ -215 +215 @@
 
 int roar_get_connection_fh (struct roar_connection * con) {
+ roar_debug_warn_sysio("roar_get_connection_fh", "roar_get_connection_vio", NULL);
+
  if ( con == NULL )
   return -1;
@@ -225 +227 @@
   return -1;
 
- return roar_vio_open_fh_socket(vio, roar_get_connection_fh(con));
+ return roar_vio_open_fh_socket(vio, con->__fh);
 }
 
 int roar_disconnect (struct roar_connection * con) {
+ struct roar_vio_calls vio;
  struct roar_message m;
 
@@ -238 +241 @@
  roar_req(con, &m, NULL);
 
-#ifdef ROAR_HAVE_IO_POSIX
- close(roar_get_connection_fh(con));
-#endif
+ if ( roar_get_connection_vio(con, &vio) != -1 ) {
+  roar_vio_close(&vio);
+ }
 
  roar_connect_fh(con, -2);
@@ -291 +294 @@
  struct roar_vio_calls vio;
 
- if ( roar_vio_open_fh_socket(&vio, roar_get_connection_fh(con)) == -1 )
+ if ( roar_get_connection_vio(con, &vio) == -1 )
   return -1;
 
@@ -331 +334 @@
  struct roar_vio_calls vio;
 
- if ( roar_vio_open_fh_socket(&vio, roar_get_connection_fh(con)) == -1 )
+ if ( roar_get_connection_vio(con, &vio) == -1 )
   return -1;
 
@@ -418 +421 @@
  struct roar_vio_calls vio;
 
- if ( roar_vio_open_fh_socket(&vio, roar_get_connection_fh(con)) == -1 )
+ if ( roar_get_connection_vio(con, &vio) == -1 )
   return -1;
 

libroar/simple.c

@@ -396 +396 @@
  struct roar_connection con;
 
- roar_debug_warn_sysio("roar_simple_get_standby", NULL, NULL);
+ roar_debug_warn_sysio("roar_simple_get_standby", "roar_get_standby", NULL);
 
  if ( roar_connect_fh(&con, fh) == -1 )