Changeset 5236:0a8740e27666 in roaraudio
- Timestamp:
- 11/12/11 16:42:21 (12 years ago)
- Branch:
- default
- Phase:
- public
- Files:
-
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
include/libroar/ctl.h
r5112 r5236 46 46 int roar_set_standby (struct roar_connection * con, int state) _LIBROAR_CTL_STDATTRS; 47 47 48 int roar_exit (struct roar_connection * con) _LIBROAR_CTL_STDATTRS _LIBROAR_ATTR_DEPRECATED;49 48 int 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; 49 int roar_server_oinfo (struct roar_connection * con, struct roar_stream * s, int dir) _LIBROAR_CTL_STDATTRS; 52 50 53 51 … … 67 65 int roar_kick (struct roar_connection * con, int type, int id) _LIBROAR_ATTR_NONNULL_ALL; 68 66 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; 67 int roar_set_vol (struct roar_connection * con, int id, struct roar_mixer_settings * mixer, int channels, int mode) _LIBROAR_CTL_STDATTRS; 71 68 int roar_get_vol (struct roar_connection * con, int id, struct roar_mixer_settings * mixer, int * channels) _LIBROAR_CTL_STDATTRS; 72 69 -
libroar/ctl.c
r5189 r5236 57 57 } 58 58 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) { 59 int roar_server_oinfo (struct roar_connection * con, struct roar_stream * s, int dir) { 64 60 struct roar_message mes; 65 61 … … 126 122 } 127 123 128 int roar_exit (struct roar_connection * con) {129 return roar_terminate(con, 0);130 }131 132 124 int roar_terminate (struct roar_connection * con, int terminate) { 133 125 struct roar_message mes; … … 232 224 } 233 225 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) { 226 int roar_set_vol (struct roar_connection * con, int id, struct roar_mixer_settings * mixer, int channels, int mode) { 239 227 struct roar_message m; 240 228 uint16_t * info = (uint16_t *) m.data; -
libroar/vs.c
r5227 r5236 1151 1151 mode = ROAR_SET_VOL_UNMAPPED; 1152 1152 1153 if ( roar_set_vol 2(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 ) 1154 1154 return 0; 1155 1155 … … 1167 1167 mode = ROAR_SET_VOL_ALL; 1168 1168 1169 if ( roar_set_vol 2(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 ) { 1170 1170 _seterrre(); 1171 1171 return -1; -
libroaresd/esdctl.c
r5233 r5236 356 356 esd, stream_id, left_scale, right_scale); 357 357 358 return roar_set_vol 2(&con, stream_id, &mixer, 2, ROAR_SET_VOL_UNMAPPED);358 return roar_set_vol(&con, stream_id, &mixer, 2, ROAR_SET_VOL_UNMAPPED); 359 359 } 360 360 -
libroaross/libroaross.c
r5234 r5236 1068 1068 mixer.mixer[0] = ( *ip & 0xFF); 1069 1069 mixer.mixer[1] = ((*ip >> 8) & 0xFF); 1070 if ( roar_set_vol 2(&(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 ) { 1071 1071 errno = EIO; 1072 1072 return -1; -
libroarpulse/introspect.c
r4893 r5236 53 53 return roar_pa_op_new_done(); 54 54 55 if ( roar_server_oinfo 2(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 ) 56 56 return roar_pa_op_new_done(); 57 57 … … 102 102 return roar_pa_op_new_done(); 103 103 104 if ( roar_server_oinfo 2(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 ) 105 105 return roar_pa_op_new_done(); 106 106 -
libroarsndio/para.c
r4891 r5236 173 173 return 0; 174 174 175 if ( roar_server_oinfo 2(&(hdl->con), &s, ROAR_DIR_PLAY) == -1 )175 if ( roar_server_oinfo(&(hdl->con), &s, ROAR_DIR_PLAY) == -1 ) 176 176 return 0; 177 177 -
libroarsndio/volume.c
r5235 r5236 66 66 mixer.mixer[0] = vol; 67 67 68 if ( roar_set_vol 2(&(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 ) 69 69 return 0; 70 70 … … 72 72 mixer.mixer[i] = vol; 73 73 74 if ( roar_set_vol 2(&(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 ) 75 75 return 0; 76 76 -
plugins/gstreamer0.10/roarmixer.c
r5235 r5236 311 311 m.scale = 65535; 312 312 313 _LIBROAR_IGNORE_RET(roar_set_vol 2(&(mixer->con), roartrack->stream_id, &m, channels, mode));313 _LIBROAR_IGNORE_RET(roar_set_vol(&(mixer->con), roartrack->stream_id, &m, channels, mode)); 314 314 } 315 315 -
plugins/gstreamer0.10/roarsink.c
r5235 r5236 251 251 goto couldnt_connect; 252 252 253 if ( roar_server_oinfo 2(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 ) 254 254 goto no_server_info; 255 255 -
plugins/xmms/roar.c
r5235 r5236 371 371 mixer.scale = 100; 372 372 373 _LIBROAR_IGNORE_RET(roar_set_vol 2(&(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)); 374 374 } 375 375 -
roarclients/roarctl.c
r5209 r5236 330 330 struct roar_stream s; 331 331 332 if ( roar_server_oinfo 2(con, &s, dir) == -1 ) {332 if ( roar_server_oinfo(con, &s, dir) == -1 ) { 333 333 fprintf(stderr, "Error: can not get server output info\n"); 334 334 return; … … 813 813 } 814 814 815 if ( roar_set_vol 2(con, id, &mixer, chans, mode) == 0 )815 if ( roar_set_vol(con, id, &mixer, chans, mode) == 0 ) 816 816 return 0; 817 817 … … 826 826 mode = ROAR_SET_VOL_ALL; 827 827 828 if ( roar_set_vol 2(con, id, &mixer, chans, mode) == 0 )828 if ( roar_set_vol(con, id, &mixer, chans, mode) == 0 ) 829 829 return 0; 830 830
Note: See TracChangeset
for help on using the changeset viewer.