Changeset 1660:99bfd21f00ef in roaraudio for libroar

Timestamp:

05/08/09 16:56:40 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

changed name of fh in con struct to fh, this should all apps requiring the private member to fail to build, added function to get fh, change code to use them both everythere

Location:

libroar

Files:

• basic.c (modified) (5 diffs)
• file.c (modified) (2 diffs)
• simple.c (modified) (4 diffs)
• stream.c (modified) (3 diffs)

libroar/basic.c

@@ -187 +187 @@
  memset(con, 0, sizeof(struct roar_connection));
 
- con->fh = fh;
+ con->__fh = fh;
 
  roar_errno = ROAR_ERROR_NONE;
  return 0;
+}
+
+int roar_get_connection_fh (struct roar_connection * con) {
+ return con->__fh;
 }
 
@@ -204 +208 @@
 
 #ifdef ROAR_HAVE_IO_POSIX
- close(con->fh);
-#endif
-
- con->fh = -1;
+ close(roar_get_connection_fh(con));
+#endif
+
+ roar_connect_fh(con, -2);
 
  roar_errno = ROAR_ERROR_NONE;
@@ -256 +260 @@
  struct roar_vio_calls vio;
 
- if ( roar_vio_open_fh_socket(&vio, con->fh) == -1 )
+ if ( roar_vio_open_fh_socket(&vio, roar_get_connection_fh(con)) == -1 )
   return -1;
 
@@ -298 +302 @@
  struct roar_vio_calls vio;
 
- if ( roar_vio_open_fh_socket(&vio, con->fh) == -1 )
+ if ( roar_vio_open_fh_socket(&vio, roar_get_connection_fh(con)) == -1 )
   return -1;
 
@@ -385 +389 @@
  struct roar_vio_calls vio;
 
- if ( roar_vio_open_fh_socket(&vio, con->fh) == -1 )
+ if ( roar_vio_open_fh_socket(&vio, roar_get_connection_fh(con)) == -1 )
   return -1;
 

libroar/file.c

@@ -203 +203 @@
  struct roar_stream localstream[1];
 
+ // FIXME: check error cases
+
  if ( !s )
   s = localstream;
@@ -255 +257 @@
   }
 
-  ROAR_SHUTDOWN(con->fh, SHUT_RD);
-
-  out = con->fh;
+  if ( (out = roar_get_connection_fh(con)) == -1 ) {
+   close(in);
+   return -1;
+  }
+
+  ROAR_SHUTDOWN(out, SHUT_RD);
  } else {
   if ( !(passfh && seek) ) {

libroar/simple.c

@@ -65 +65 @@
 int roar_simple_stream_obj  (struct roar_stream * s, int rate, int channels, int bits, int codec, char * server, int dir, char * name) {
  struct roar_connection con;
+ int ret;
 
  if ( roar_simple_connect(&con, server, name) == -1 ) {
@@ -87 +88 @@
  }
 
+ if ( (ret = roar_get_connection_fh(&con)) == -1 ) {
+  roar_disconnect(&con);
+  return -1;
+ }
+
  if ( dir == ROAR_DIR_PLAY ) {
-  ROAR_SHUTDOWN(con.fh, SHUT_RD);
+  ROAR_SHUTDOWN(ret, SHUT_RD);
  } else if ( dir == ROAR_DIR_MONITOR || dir == ROAR_DIR_RECORD ) {
-  ROAR_SHUTDOWN(con.fh, SHUT_WR);
- }
-
- return con.fh;
+  ROAR_SHUTDOWN(ret, SHUT_WR);
+ }
+
+ return ret;
 }
 
@@ -146 +152 @@
 
 #ifdef ROAR_HAVE_BSDSOCKETS
- if ( getsockname(con->fh, (struct sockaddr *)&socket_addr, &len) == -1 ) {
+ if ( getsockname(roar_get_connection_fh(con), (struct sockaddr *)&socket_addr, &len) == -1 ) {
   return -1;
  }
@@ -339 +345 @@
  struct roar_connection con;
 
- con.fh = fh;
+ if ( roar_connect_fh(&con, fh) == -1 )
+  return -1;
 
  return roar_get_standby(&con);

libroar/stream.c

@@ -203 +203 @@
 int roar_stream_passfh  (struct roar_connection * con, struct roar_stream * s, int fh) {
  struct roar_message m;
+ int confh;
 
  m.cmd     = ROAR_CMD_PASSFH;
@@ -210 +211 @@
 
  ROAR_DBG("roar_stream_passfh(con={.fh=%i,...}, s={.id=%i,...}, fh=%i) = ?", con->fh, s->id, fh);
+
+ if ( (confh = roar_get_connection_fh(con)) == -1 )
+  return -1;
 
  if ( roar_send_message(con, &m, NULL) == -1 ) {
@@ -218 +222 @@
  ROAR_DBG("roar_stream_passfh(*): msg send");
 
- if ( roar_socket_send_fh(con->fh, fh, NULL, 0) == -1 )
+ if ( roar_socket_send_fh(confh, fh, NULL, 0) == -1 )
   return -1;