Changeset 1660:99bfd21f00ef in roaraudio for libroar/stream.c

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

File:

• libroar/stream.c (modified) (3 diffs)

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;