Changeset 5110:1a60f34b8a9f in roaraudio


Ignore:
Timestamp:
07/30/11 00:09:40 (13 years ago)
Author:
phi
Branch:
default
Phase:
public
Message:

fixed some warnings

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • include/libroar/ctl.h

    r5109 r5110  
    6565int roar_get_stream   (struct roar_connection * con, struct roar_stream * stream, int id) _LIBROAR_CTL_STDATTRS; 
    6666 
    67 int roar_kick         (struct roar_connection * con, int type, int id) _LIBROAR_CTL_STDATTRS; 
     67int roar_kick         (struct roar_connection * con, int type, int id) _LIBROAR_ATTR_NONNULL_ALL; 
    6868 
    6969int roar_set_vol      (struct roar_connection * con, int id, struct roar_mixer_settings * mixer, int   channels) _LIBROAR_CTL_STDATTRS _LIBROAR_ATTR_DEPRECATED; 
  • libroar/simple.c

    r5061 r5110  
    368368 
    369369int roar_simple_play_file(char * file, char * server, char * name) { 
    370  struct roar_connection con; 
    371  
    372  if ( roar_simple_connect(&con, server, name) == -1 ) { 
    373   return -1; 
    374  } 
    375  
    376  return roar_file_play(&con, file, 1); // con is closed by this as this stream will be an execed one. 
     370 roar_vs_t * vss; 
     371 int err; 
     372 
     373 vss = roar_vs_new_from_file(server, name, file, &err); 
     374 
     375 if ( vss == NULL ) { 
     376  roar_err_set(err); 
     377  return -1; 
     378 } 
     379 
     380 if ( roar_vs_run(vss, &err) == -1 ) { 
     381  roar_err_set(err); 
     382  return -1; 
     383 } 
     384 
     385 roar_vs_sync(vss, ROAR_VS_WAIT, NULL); 
     386 roar_vs_close(vss, ROAR_VS_FALSE, NULL); 
     387 
     388 return 0; 
    377389} 
    378390 
     
    418430  return -1; 
    419431 
    420  if ( roar_stream_connect(con, s, dir) == -1 ) 
    421   return -1; 
    422  
    423  if ( roar_stream_set_flags(con, s, ROAR_FLAG_VIRTUAL, 0) == -1 ) { 
     432 if ( roar_stream_connect2(con, s, dir, -1) == -1 ) 
     433  return -1; 
     434 
     435 if ( roar_stream_set_flags2(con, s, ROAR_FLAG_VIRTUAL, ROAR_SET_FLAG) == -1 ) { 
    424436  roar_kick(con, ROAR_OT_STREAM, roar_stream_get_id(s)); 
    425437  return -1; 
Note: See TracChangeset for help on using the changeset viewer.