Changeset 5235:f6772d7182e8 in roaraudio for plugins
- Timestamp:
- 11/12/11 16:33:39 (12 years ago)
- Branch:
- default
- Phase:
- public
- Location:
- plugins
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
plugins/gstreamer0.10/roarmixer.c
r4708 r5235 285 285 int channels; 286 286 struct roar_mixer_settings m; 287 int mode = ROAR_SET_VOL_ALL; 287 288 gint i; 288 289 … … 296 297 297 298 if ( channels != track->num_channels ) { 298 ROAR_WARN("gst_roarmixer_get_volume(*): numer of channels for stream %i mismatch", roartrack->stream_id); 299 ROAR_WARN("gst_roarmixer_get_volume(*): numer of channels for stream %i mismatch (local: %i, server: %i)", 300 roartrack->stream_id, (int)track->num_channels, channels); 299 301 300 302 if ( track->num_channels < channels ) 301 303 channels = track->num_channels; 304 mode = ROAR_SET_VOL_UNMAPPED; 302 305 } 303 306 … … 308 311 m.scale = 65535; 309 312 310 roar_set_vol(&(mixer->con), roartrack->stream_id, &m, channels);313 _LIBROAR_IGNORE_RET(roar_set_vol2(&(mixer->con), roartrack->stream_id, &m, channels, mode)); 311 314 } 312 315 … … 360 363 361 364 if (mute) { 362 roar_stream_set_flags(&(mixer->con), &s, ROAR_FLAG_MUTE, ROAR_SET_FLAG);365 _LIBROAR_IGNORE_RET(roar_stream_set_flags2(&(mixer->con), &s, ROAR_FLAG_MUTE, ROAR_SET_FLAG)); 363 366 } else { 364 roar_stream_set_flags(&(mixer->con), &s, ROAR_FLAG_MUTE, ROAR_RESET_FLAG);367 _LIBROAR_IGNORE_RET(roar_stream_set_flags2(&(mixer->con), &s, ROAR_FLAG_MUTE, ROAR_RESET_FLAG)); 365 368 } 366 369 } -
plugins/gstreamer0.10/roarsink.c
r4708 r5235 251 251 goto couldnt_connect; 252 252 253 if ( roar_server_oinfo (roar_vs_connection_obj(roarsink->vss, NULL), &oinfo) == -1 )253 if ( roar_server_oinfo2(roar_vs_connection_obj(roarsink->vss, NULL), &oinfo, ROAR_DIR_PLAY) == -1 ) 254 254 goto no_server_info; 255 255 -
plugins/xmms/roar.c
r4708 r5235 170 170 g_inst.pause = 0; 171 171 172 roar_stream_set_role(&(g_inst.con), &(g_inst.stream), ROAR_ROLE_MUSIC);172 _LIBROAR_IGNORE_RET(roar_stream_set_role(&(g_inst.con), &(g_inst.stream), ROAR_ROLE_MUSIC)); 173 173 roar_update_metadata(); 174 174 roar_set_volume(g_inst.mixer.l, g_inst.mixer.r); … … 371 371 mixer.scale = 100; 372 372 373 roar_set_vol(&(g_inst.con), g_inst.stream.id, &mixer, 2);373 _LIBROAR_IGNORE_RET(roar_set_vol2(&(g_inst.con), g_inst.stream.id, &mixer, 2, ROAR_SET_VOL_UNMAPPED)); 374 374 } 375 375
Note: See TracChangeset
for help on using the changeset viewer.