Changeset 1660:99bfd21f00ef in roaraudio for libroar/simple.c
- Timestamp:
- 05/08/09 16:56:40 (15 years ago)
- Branch:
- default
- Phase:
- public
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
libroar/simple.c
r1476 r1660 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) { 66 66 struct roar_connection con; 67 int ret; 67 68 68 69 if ( roar_simple_connect(&con, server, name) == -1 ) { … … 87 88 } 88 89 90 if ( (ret = roar_get_connection_fh(&con)) == -1 ) { 91 roar_disconnect(&con); 92 return -1; 93 } 94 89 95 if ( dir == ROAR_DIR_PLAY ) { 90 ROAR_SHUTDOWN( con.fh, SHUT_RD);96 ROAR_SHUTDOWN(ret, SHUT_RD); 91 97 } else if ( dir == ROAR_DIR_MONITOR || dir == ROAR_DIR_RECORD ) { 92 ROAR_SHUTDOWN( con.fh, SHUT_WR);93 } 94 95 return con.fh;98 ROAR_SHUTDOWN(ret, SHUT_WR); 99 } 100 101 return ret; 96 102 } 97 103 … … 146 152 147 153 #ifdef ROAR_HAVE_BSDSOCKETS 148 if ( getsockname( con->fh, (struct sockaddr *)&socket_addr, &len) == -1 ) {154 if ( getsockname(roar_get_connection_fh(con), (struct sockaddr *)&socket_addr, &len) == -1 ) { 149 155 return -1; 150 156 } … … 339 345 struct roar_connection con; 340 346 341 con.fh = fh; 347 if ( roar_connect_fh(&con, fh) == -1 ) 348 return -1; 342 349 343 350 return roar_get_standby(&con);
Note: See TracChangeset
for help on using the changeset viewer.