Changeset 5118:2b5777714b0d in roaraudio


Ignore:
Timestamp:
08/01/11 03:27:44 (13 years ago)
Author:
phi
Branch:
default
Phase:
public
Message:

fixed some warnings

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • include/libroar/simple.h

    r5117 r5118  
    4343 
    4444int 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, char * name) _LIBROAR_ATTR_DEPRECATED; 
     45int 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; 
    4646 
    4747int 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  
    261261  } 
    262262 
    263   if ( roar_stream_connect(con, s, ROAR_DIR_PLAY) == -1 ) { 
     263  if ( roar_stream_connect2(con, s, ROAR_DIR_PLAY, -1) == -1 ) { 
    264264   ROAR_ERR("roar_file_play_full(*): Can not connect new stream to server."); 
    265265   close(in); 
     
    295295   } 
    296296 
    297    if ( roar_stream_connect(con, s, ROAR_DIR_PLAY) == -1 ) { 
     297   if ( roar_stream_connect2(con, s, ROAR_DIR_PLAY, -1) == -1 ) { 
    298298    close(in); 
    299299    return -1; 
  • libroar/simple.c

    r5114 r5118  
    7070} 
    7171 
    72 int roar_simple_stream_obj  (struct roar_stream * s, int rate, int channels, int bits, int codec, const char * server, int dir, char * name) { 
     72int roar_simple_stream_obj  (struct roar_stream * s, int rate, int channels, int bits, int codec, const char * server, int dir, const char * name) { 
    7373 struct roar_connection con; 
    7474 int ret; 
     
    8787 } 
    8888 
    89  if ( roar_stream_connect(&con, s, dir) == -1 ) { 
     89 if ( roar_stream_connect2(&con, s, dir, -1) == -1 ) { 
    9090  roar_disconnect(&con); 
    9191  return -1; 
     
    266266 } 
    267267 
    268  if ( roar_stream_connect(con, s, dir) == -1 ) { 
     268 if ( roar_stream_connect2(con, s, dir, -1) == -1 ) { 
    269269  return -1; 
    270270 } 
  • libroar/vio_stream.c

    r5116 r5118  
    121121 } 
    122122 
    123  if ( roar_stream_connect(con, &stream, dir) == -1 ) { 
     123 if ( roar_stream_connect2(con, &stream, dir, -1) == -1 ) { 
    124124  err = roar_error; 
    125125  roar_disconnect(con); 
Note: See TracChangeset for help on using the changeset viewer.