Changeset 5238:5117fb0e7ed4 in roaraudio for roarclients


Ignore:
Timestamp:
11/12/11 17:41:13 (12 years ago)
Author:
phi
Branch:
default
Phase:
public
Message:

Removed roar_stream_connect(), roar_stream_add_data(), roar_stream_send_data() and roar_stream_set_flags().

Location:
roarclients
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • roarclients/.release-helper

    r5226 r5238  
    22@RM roarcatsendfile.c 
    33@RM roarcat2sock.c 
     4@RM roarcatad.c 
    45#!END 
  • roarclients/Makefile

    r5226 r5238  
    99 
    1010#TARGETS_TESTS=pinentrytest zcattest pgptest pipetest polytest roarfctest 
    11 #TARGETS_OLD=roarcatad roarcatpassfh roarsocktypes 
     11#TARGETS_OLD=roarcatpassfh roarsocktypes 
    1212 
    1313TARGETS=$(TARGETS_IO) $(TARGETS_CTL) $(TARGETS_DSP) $(TARGETS_MISC) $(TARGETS_DEVEL) $(TARGETS_EXAMPLE) $(TARGETS_M) $(TARGETS_VIO) 
  • roarclients/roarcat.c

    r5202 r5238  
    187187 } 
    188188 
    189  if ( roar_stream_connect2(&con, &s, dir, -1) == -1 ) { 
     189 if ( roar_stream_connect(&con, &s, dir, -1) == -1 ) { 
    190190  fprintf(stderr, "Error: can not connect stream to server\n"); 
    191191  roar_disconnect(&con); 
  • roarclients/roarcatad.c

    r5109 r5238  
    8989 } 
    9090 
    91  if ( roar_stream_connect2(&con, &s, ROAR_DIR_PLAY, -1) == -1 ) { 
     91 if ( roar_stream_connect(&con, &s, ROAR_DIR_PLAY, -1) == -1 ) { 
    9292  roar_disconnect(&con); 
    9393  return 1; 
  • roarclients/roarcatpassfh.c

    r5109 r5238  
    9191 } 
    9292 
    93  if ( roar_stream_connect2(&con, &s, ROAR_DIR_PLAY, -1) == -1 ) { 
     93 if ( roar_stream_connect(&con, &s, ROAR_DIR_PLAY, -1) == -1 ) { 
    9494  roar_disconnect(&con); 
    9595  return 1; 
  • roarclients/roarctl.c

    r5236 r5238  
    10591059 } 
    10601060 
    1061  return roar_stream_set_flags2(con, s, f, action); 
     1061 return roar_stream_set_flags(con, s, f, action); 
    10621062} 
    10631063 
  • roarclients/roarinterconnect.c

    r5185 r5238  
    505505 } 
    506506 
    507  if ( roar_stream_connect2(con, stream, localdir, -1) == -1 ) { 
     507 if ( roar_stream_connect(con, stream, localdir, -1) == -1 ) { 
    508508  roar_disconnect(con); 
    509509  return 22; 
  • roarclients/roarmon.c

    r5109 r5238  
    198198 } 
    199199 
    200  if ( roar_stream_connect2(&con, &s, dir, -1) == -1 ) { 
     200 if ( roar_stream_connect(&con, &s, dir, -1) == -1 ) { 
    201201  fprintf(stderr, "Error: can not connect stream to server\n"); 
    202202  roar_disconnect(&con); 
     
    205205 
    206206 if ( prethru ) { 
    207   if ( roar_stream_set_flags2(&con, &s, ROAR_FLAG_PRETHRU, ROAR_SET_FLAG) == -1 ) { 
     207  if ( roar_stream_set_flags(&con, &s, ROAR_FLAG_PRETHRU, ROAR_SET_FLAG) == -1 ) { 
    208208   fprintf(stderr, "Error: can not set prethru flag on stream\n"); 
    209209   roar_disconnect(&con); 
  • roarclients/roarmonhttp.c

    r5109 r5238  
    331331 } 
    332332 
    333  if ( roar_stream_connect2(&con, &s, dir, -1) == -1 ) { 
     333 if ( roar_stream_connect(&con, &s, dir, -1) == -1 ) { 
    334334  roar_disconnect(&con); 
    335335  return 11; 
     
    337337 
    338338 if ( sflags != ROAR_FLAG_NONE ) { 
    339   if ( roar_stream_set_flags2(&con, &s, sflags, ROAR_SET_FLAG) == -1 ) { 
     339  if ( roar_stream_set_flags(&con, &s, sflags, ROAR_SET_FLAG) == -1 ) { 
    340340   roar_disconnect(&con); 
    341341   return 14; 
  • roarclients/roarradio.c

    r5179 r5238  
    211211 } 
    212212 
    213  if ( roar_stream_connect2(con, stream, ROAR_DIR_PLAY, -1) == -1 ) { 
     213 if ( roar_stream_connect(con, stream, ROAR_DIR_PLAY, -1) == -1 ) { 
    214214  roar_disconnect(con); 
    215215  return 1; 
Note: See TracChangeset for help on using the changeset viewer.