Changeset 5231:8b30ddb689b8 in roaraudio for libroar

Timestamp:

11/12/11 14:31:25 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

first updates to connection object

File:

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

libroar/basic.c

@@ -286 +286 @@
  memset(con, 0, sizeof(struct roar_connection));
 
- con->flags = ROAR_CON_FLAGS_FH;
- con->__fh  = fh;
-
- if ( roar_vio_open_fh_socket(&(con->viocon), fh) != -1 )
+ if ( roar_vio_open_fh_socket(&(con->viocon), fh) != -1 ) {
   con->flags |= ROAR_CON_FLAGS_VIO;
+ }
 
  roar_err_set(ROAR_ERROR_NONE);
@@ -297 +295 @@
 
 int roar_get_connection_fh (struct roar_connection * con) {
+ int fh;
+
+ ROAR_DBG("roar_get_connection_fh(con=%p) = ?", con);
+
  roar_debug_warn_sysio("roar_get_connection_fh", "roar_get_connection_vio2", NULL);
 
@@ -302 +304 @@
   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);
+ ROAR_DBG("roar_get_connection_fh(con=%p) = ?", con);
+
+ if ( roar_vio_ctl(&(con->viocon), ROAR_VIO_CTL_GET_FH, &fh) == -1 )
+  return -1;
+
+ ROAR_DBG("roar_get_connection_fh(con=%p) = %i", con, fh);
+
+ return fh;
 }
 
@@ -359 +353 @@
                                  void (*cb)(struct roar_connection * con,
                                             struct roar_message    * mes,
+                                            void                   * data,
                                             void                   * userdata),
                                  void * userdata) {
@@ -365 +360 @@
 
  con->cb       = cb;
- con->userdata = userdata;
+ con->cb_userdata = userdata;
 
  return 0;