Changeset 5118:2b5777714b0d in roaraudio
- Timestamp:
- 08/01/11 03:27:44 (13 years ago)
- Branch:
- default
- Phase:
- public
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
include/libroar/simple.h
r5117 r5118 43 43 44 44 int roar_simple_stream (int rate, int channels, int bits, int codec, const char * server, int dir, const char * name) _LIBROAR_ATTR_DEPRECATED; 45 int roar_simple_stream_obj (struct roar_stream * s, int rate, int channels, int bits, int codec, const char * server, int dir, c har * name) _LIBROAR_ATTR_DEPRECATED;45 int roar_simple_stream_obj (struct roar_stream * s, int rate, int channels, int bits, int codec, const char * server, int dir, const char * name) _LIBROAR_ATTR_DEPRECATED; 46 46 47 47 int roar_simple_new_stream_attachexeced_obj (struct roar_connection * con, struct roar_stream * s, int rate, int channels, int bits, int codec, int dir); -
libroar/file.c
r4708 r5118 261 261 } 262 262 263 if ( roar_stream_connect (con, s, ROAR_DIR_PLAY) == -1 ) {263 if ( roar_stream_connect2(con, s, ROAR_DIR_PLAY, -1) == -1 ) { 264 264 ROAR_ERR("roar_file_play_full(*): Can not connect new stream to server."); 265 265 close(in); … … 295 295 } 296 296 297 if ( roar_stream_connect (con, s, ROAR_DIR_PLAY) == -1 ) {297 if ( roar_stream_connect2(con, s, ROAR_DIR_PLAY, -1) == -1 ) { 298 298 close(in); 299 299 return -1; -
libroar/simple.c
r5114 r5118 70 70 } 71 71 72 int roar_simple_stream_obj (struct roar_stream * s, int rate, int channels, int bits, int codec, const char * server, int dir, c har * name) {72 int roar_simple_stream_obj (struct roar_stream * s, int rate, int channels, int bits, int codec, const char * server, int dir, const char * name) { 73 73 struct roar_connection con; 74 74 int ret; … … 87 87 } 88 88 89 if ( roar_stream_connect (&con, s, dir) == -1 ) {89 if ( roar_stream_connect2(&con, s, dir, -1) == -1 ) { 90 90 roar_disconnect(&con); 91 91 return -1; … … 266 266 } 267 267 268 if ( roar_stream_connect (con, s, dir) == -1 ) {268 if ( roar_stream_connect2(con, s, dir, -1) == -1 ) { 269 269 return -1; 270 270 } -
libroar/vio_stream.c
r5116 r5118 121 121 } 122 122 123 if ( roar_stream_connect (con, &stream, dir) == -1 ) {123 if ( roar_stream_connect2(con, &stream, dir, -1) == -1 ) { 124 124 err = roar_error; 125 125 roar_disconnect(con);
Note: See TracChangeset
for help on using the changeset viewer.