mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-04 13:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

core: sample_spec.rate is in Hz, not kHz; change logging output

Browse source
This commit is contained in:
Peter Meerwald 2011-12-19 12:28:42 +01:00 • committed by Arun Raghavan
parent 49fd49f21f
commit 638b0264e0
4 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/pulsecore/sink-input.c
View file

@ -376,10 +376,10 @@ int pa_sink_input_new(
pa_log_info("Trying to change sample rate"); pa_log_info("Trying to change sample rate");
if (pa_sink_update_rate(data->sink, data->sample_spec.rate, pa_sink_input_new_data_is_passthrough(data)) == TRUE) if (pa_sink_update_rate(data->sink, data->sample_spec.rate, pa_sink_input_new_data_is_passthrough(data)) == TRUE)
pa_log_info("Rate changed to %u kHz", pa_log_info("Rate changed to %u Hz",
data->sink->sample_spec.rate); data->sink->sample_spec.rate);
else else
pa_log_info("Resampling enabled to %u kHz", data->sink->sample_spec.rate); pa_log_info("Resampling enabled to %u Hz", data->sink->sample_spec.rate);
} }
/* Due to the fixing of the sample spec the volume might not match anymore */ /* Due to the fixing of the sample spec the volume might not match anymore */
@ -1642,10 +1642,10 @@ int pa_sink_input_finish_move(pa_sink_input *i, pa_sink *dest, pa_bool_t save) {
pa_log_info("Trying to change sample rate"); pa_log_info("Trying to change sample rate");
if (pa_sink_update_rate(dest, i->sample_spec.rate, pa_sink_input_is_passthrough(i)) == TRUE) if (pa_sink_update_rate(dest, i->sample_spec.rate, pa_sink_input_is_passthrough(i)) == TRUE)
pa_log_info("Rate changed to %u kHz", pa_log_info("Rate changed to %u Hz",
dest->sample_spec.rate); dest->sample_spec.rate);
else else
pa_log_info("Resampling enabled to %u kHz", pa_log_info("Resampling enabled to %u Hz",
dest->sample_spec.rate); dest->sample_spec.rate);
} }

2
src/pulsecore/sink.c
View file

@ -1316,7 +1316,7 @@ pa_bool_t pa_sink_update_rate(pa_sink *s, uint32_t rate, pa_bool_t passthrough)
} }
if (PA_SINK_IS_RUNNING(s->state)) { if (PA_SINK_IS_RUNNING(s->state)) {
pa_log_info("Cannot update rate, SINK_IS_RUNNING, will keep using %u kHz", pa_log_info("Cannot update rate, SINK_IS_RUNNING, will keep using %u Hz",
s->sample_spec.rate); s->sample_spec.rate);
return FALSE; return FALSE;
} }

8
src/pulsecore/source-output.c
View file

@ -355,10 +355,10 @@ int pa_source_output_new(
pa_log_info("Trying to change sample rate"); pa_log_info("Trying to change sample rate");
if (pa_source_update_rate(data->source, data->sample_spec.rate, pa_source_output_new_data_is_passthrough(data)) == TRUE) if (pa_source_update_rate(data->source, data->sample_spec.rate, pa_source_output_new_data_is_passthrough(data)) == TRUE)
pa_log_info("Rate changed to %u kHz", pa_log_info("Rate changed to %u Hz",
data->source->sample_spec.rate); data->source->sample_spec.rate);
else else
pa_log_info("Resampling enabled to %u kHz", data->source->sample_spec.rate); pa_log_info("Resampling enabled to %u Hz", data->source->sample_spec.rate);
} }
if (data->resample_method == PA_RESAMPLER_INVALID) if (data->resample_method == PA_RESAMPLER_INVALID)
@ -1410,10 +1410,10 @@ int pa_source_output_finish_move(pa_source_output *o, pa_source *dest, pa_bool_t
pa_log_info("Trying to change sample rate"); pa_log_info("Trying to change sample rate");
if (pa_source_update_rate(dest, o->sample_spec.rate, pa_source_output_is_passthrough(o)) == TRUE) if (pa_source_update_rate(dest, o->sample_spec.rate, pa_source_output_is_passthrough(o)) == TRUE)
pa_log_info("Rate changed to %u kHz", pa_log_info("Rate changed to %u Hz",
dest->sample_spec.rate); dest->sample_spec.rate);
else else
pa_log_info("Resampling enabled to %u kHz", pa_log_info("Resampling enabled to %u Hz",
dest->sample_spec.rate); dest->sample_spec.rate);
} }

2
src/pulsecore/source.c
View file

@ -931,7 +931,7 @@ pa_bool_t pa_source_update_rate(pa_source *s, uint32_t rate, pa_bool_t passthrou
} }
if (PA_SOURCE_IS_RUNNING(s->state)) { if (PA_SOURCE_IS_RUNNING(s->state)) {
pa_log_info("Cannot update rate, SOURCE_IS_RUNNING, will keep using %u kHz", pa_log_info("Cannot update rate, SOURCE_IS_RUNNING, will keep using %u Hz",
s->sample_spec.rate); s->sample_spec.rate);
return FALSE; return FALSE;
} }