Changeset 5236:0a8740e27666 in roaraudio


Ignore:
Timestamp:
11/12/11 16:42:21 (12 years ago)
Author:
phi
Branch:
default
Phase:
public
Message:

Removed roar_set_vol() and roar_server_oinfo(), as well as roar_exit().

Files:
12 edited

Legend:

Unmodified
Added
Removed
  • include/libroar/ctl.h

    r5112 r5236  
    4646int roar_set_standby   (struct roar_connection * con, int state) _LIBROAR_CTL_STDATTRS; 
    4747 
    48 int roar_exit           (struct roar_connection * con) _LIBROAR_CTL_STDATTRS _LIBROAR_ATTR_DEPRECATED; 
    4948int roar_terminate      (struct roar_connection * con, int terminate) _LIBROAR_CTL_STDATTRS; 
    50 int roar_server_oinfo   (struct roar_connection * con, struct roar_stream * s) _LIBROAR_CTL_STDATTRS _LIBROAR_ATTR_DEPRECATED; 
    51 int roar_server_oinfo2  (struct roar_connection * con, struct roar_stream * s, int dir) _LIBROAR_CTL_STDATTRS; 
     49int roar_server_oinfo   (struct roar_connection * con, struct roar_stream * s, int dir) _LIBROAR_CTL_STDATTRS; 
    5250 
    5351 
     
    6765int roar_kick         (struct roar_connection * con, int type, int id) _LIBROAR_ATTR_NONNULL_ALL; 
    6866 
    69 int roar_set_vol      (struct roar_connection * con, int id, struct roar_mixer_settings * mixer, int   channels) _LIBROAR_CTL_STDATTRS _LIBROAR_ATTR_DEPRECATED; 
    70 int roar_set_vol2     (struct roar_connection * con, int id, struct roar_mixer_settings * mixer, int   channels, int mode) _LIBROAR_CTL_STDATTRS; 
     67int roar_set_vol      (struct roar_connection * con, int id, struct roar_mixer_settings * mixer, int   channels, int mode) _LIBROAR_CTL_STDATTRS; 
    7168int roar_get_vol      (struct roar_connection * con, int id, struct roar_mixer_settings * mixer, int * channels) _LIBROAR_CTL_STDATTRS; 
    7269 
  • libroar/ctl.c

    r5189 r5236  
    5757} 
    5858 
    59 int roar_server_oinfo   (struct roar_connection * con, struct roar_stream * s) { 
    60  return roar_server_oinfo2(con, s, -1); 
    61 } 
    62  
    63 int roar_server_oinfo2  (struct roar_connection * con, struct roar_stream * s, int dir) { 
     59int roar_server_oinfo  (struct roar_connection * con, struct roar_stream * s, int dir) { 
    6460 struct roar_message mes; 
    6561 
     
    126122} 
    127123 
    128 int roar_exit   (struct roar_connection * con) { 
    129  return roar_terminate(con, 0); 
    130 } 
    131  
    132124int roar_terminate (struct roar_connection * con, int terminate) { 
    133125 struct roar_message mes; 
     
    232224} 
    233225 
    234 int roar_set_vol      (struct roar_connection * con, int id, struct roar_mixer_settings * mixer, int channels) { 
    235  return roar_set_vol2(con, id, mixer, channels, ROAR_SET_VOL_ALL); 
    236 } 
    237  
    238 int roar_set_vol2     (struct roar_connection * con, int id, struct roar_mixer_settings * mixer, int   channels, int mode) { 
     226int roar_set_vol     (struct roar_connection * con, int id, struct roar_mixer_settings * mixer, int   channels, int mode) { 
    239227 struct roar_message m; 
    240228 uint16_t * info = (uint16_t *) m.data; 
  • libroar/vs.c

    r5227 r5236  
    11511151  mode = ROAR_SET_VOL_UNMAPPED; 
    11521152 
    1153  if ( roar_set_vol2(vss->con, roar_stream_get_id(&(vss->stream)), &mixer, channels, mode) == 0 ) 
     1153 if ( roar_set_vol(vss->con, roar_stream_get_id(&(vss->stream)), &mixer, channels, mode) == 0 ) 
    11541154  return 0; 
    11551155 
     
    11671167 mode     = ROAR_SET_VOL_ALL; 
    11681168 
    1169  if ( roar_set_vol2(vss->con, roar_stream_get_id(&(vss->stream)), &mixer, channels, mode) == -1 ) { 
     1169 if ( roar_set_vol(vss->con, roar_stream_get_id(&(vss->stream)), &mixer, channels, mode) == -1 ) { 
    11701170  _seterrre(); 
    11711171  return -1; 
  • libroaresd/esdctl.c

    r5233 r5236  
    356356                esd, stream_id, left_scale, right_scale); 
    357357 
    358  return roar_set_vol2(&con, stream_id, &mixer, 2, ROAR_SET_VOL_UNMAPPED); 
     358 return roar_set_vol(&con, stream_id, &mixer, 2, ROAR_SET_VOL_UNMAPPED); 
    359359} 
    360360 
  • libroaross/libroaross.c

    r5234 r5236  
    10681068   mixer.mixer[0] = ( *ip       & 0xFF); 
    10691069   mixer.mixer[1] = ((*ip >> 8) & 0xFF); 
    1070    if ( roar_set_vol2(&(handle->session->con), o_sid, &mixer, 2, ROAR_SET_VOL_UNMAPPED) == -1 ) { 
     1070   if ( roar_set_vol(&(handle->session->con), o_sid, &mixer, 2, ROAR_SET_VOL_UNMAPPED) == -1 ) { 
    10711071    errno = EIO; 
    10721072    return -1; 
  • libroarpulse/introspect.c

    r4893 r5236  
    5353  return roar_pa_op_new_done(); 
    5454 
    55  if ( roar_server_oinfo2(roar_pa_context_get_con(c), &stream, ROAR_DIR_PLAY) == -1 ) 
     55 if ( roar_server_oinfo(roar_pa_context_get_con(c), &stream, ROAR_DIR_PLAY) == -1 ) 
    5656  return roar_pa_op_new_done(); 
    5757 
     
    102102  return roar_pa_op_new_done(); 
    103103 
    104  if ( roar_server_oinfo2(roar_pa_context_get_con(c), &stream, ROAR_DIR_PLAY) == -1 ) 
     104 if ( roar_server_oinfo(roar_pa_context_get_con(c), &stream, ROAR_DIR_PLAY) == -1 ) 
    105105  return roar_pa_op_new_done(); 
    106106 
  • libroarsndio/para.c

    r4891 r5236  
    173173  return 0; 
    174174 
    175  if ( roar_server_oinfo2(&(hdl->con), &s, ROAR_DIR_PLAY) == -1 ) 
     175 if ( roar_server_oinfo(&(hdl->con), &s, ROAR_DIR_PLAY) == -1 ) 
    176176  return 0; 
    177177 
  • libroarsndio/volume.c

    r5235 r5236  
    6666 mixer.mixer[0] = vol; 
    6767 
    68  if ( roar_set_vol2(&(hdl->con), roar_stream_get_id(&(hdl->stream)), &mixer, 0, ROAR_SET_VOL_UNMAPPED) == -1 ) 
     68 if ( roar_set_vol(&(hdl->con), roar_stream_get_id(&(hdl->stream)), &mixer, 0, ROAR_SET_VOL_UNMAPPED) == -1 ) 
    6969  return 0; 
    7070 
     
    7272  mixer.mixer[i] = vol; 
    7373 
    74  if ( roar_set_vol2(&(hdl->con), roar_stream_get_id(&(hdl->stream)), &mixer, hdl->info.channels, ROAR_SET_VOL_ALL) == -1 ) 
     74 if ( roar_set_vol(&(hdl->con), roar_stream_get_id(&(hdl->stream)), &mixer, hdl->info.channels, ROAR_SET_VOL_ALL) == -1 ) 
    7575  return 0; 
    7676 
  • plugins/gstreamer0.10/roarmixer.c

    r5235 r5236  
    311311 m.scale = 65535; 
    312312 
    313  _LIBROAR_IGNORE_RET(roar_set_vol2(&(mixer->con), roartrack->stream_id, &m, channels, mode)); 
     313 _LIBROAR_IGNORE_RET(roar_set_vol(&(mixer->con), roartrack->stream_id, &m, channels, mode)); 
    314314} 
    315315 
  • plugins/gstreamer0.10/roarsink.c

    r5235 r5236  
    251251    goto couldnt_connect; 
    252252 
    253   if ( roar_server_oinfo2(roar_vs_connection_obj(roarsink->vss, NULL), &oinfo, ROAR_DIR_PLAY) == -1 ) 
     253  if ( roar_server_oinfo(roar_vs_connection_obj(roarsink->vss, NULL), &oinfo, ROAR_DIR_PLAY) == -1 ) 
    254254    goto no_server_info; 
    255255 
  • plugins/xmms/roar.c

    r5235 r5236  
    371371 mixer.scale    = 100; 
    372372 
    373  _LIBROAR_IGNORE_RET(roar_set_vol2(&(g_inst.con), g_inst.stream.id, &mixer, 2, ROAR_SET_VOL_UNMAPPED)); 
     373 _LIBROAR_IGNORE_RET(roar_set_vol(&(g_inst.con), g_inst.stream.id, &mixer, 2, ROAR_SET_VOL_UNMAPPED)); 
    374374} 
    375375 
  • roarclients/roarctl.c

    r5209 r5236  
    330330 struct roar_stream s; 
    331331 
    332  if ( roar_server_oinfo2(con, &s, dir) == -1 ) { 
     332 if ( roar_server_oinfo(con, &s, dir) == -1 ) { 
    333333  fprintf(stderr, "Error: can not get server output info\n"); 
    334334  return; 
     
    813813 } 
    814814 
    815  if ( roar_set_vol2(con, id, &mixer, chans, mode) == 0 ) 
     815 if ( roar_set_vol(con, id, &mixer, chans, mode) == 0 ) 
    816816  return 0; 
    817817 
     
    826826 mode  = ROAR_SET_VOL_ALL; 
    827827 
    828  if ( roar_set_vol2(con, id, &mixer, chans, mode) == 0 ) 
     828 if ( roar_set_vol(con, id, &mixer, chans, mode) == 0 ) 
    829829  return 0; 
    830830 
Note: See TracChangeset for help on using the changeset viewer.