[pulseaudio-discuss] [PATCH] sink: Add casts to some printf arguments to get rid of compiler warnings.
Colin Guthrie
gmane at colin.guthr.ie
Sun Feb 27 06:16:01 PST 2011
'Twas brillig, and Tanu Kaskinen at 27/02/11 11:21 did gyre and gimble:
> ---
> src/pulsecore/sink.c | 11 ++++++-----
> 1 files changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/src/pulsecore/sink.c b/src/pulsecore/sink.c
> index ba7e599..915ee0f 100644
> --- a/src/pulsecore/sink.c
> +++ b/src/pulsecore/sink.c
> @@ -2941,11 +2941,11 @@ void pa_sink_volume_change_push(pa_sink *s) {
> PA_LLIST_INSERT_AFTER(pa_sink_volume_change, s->thread_info.volume_changes, c, nc);
> }
>
> - pa_log_debug("Volume going %s to %d at %llu", direction, pa_cvolume_avg(&nc->hw_volume), nc->at);
> + pa_log_debug("Volume going %s to %d at %llu", direction, pa_cvolume_avg(&nc->hw_volume), (long long unsigned) nc->at);
>
> /* We can ignore volume events that came earlier but should happen later than this. */
> PA_LLIST_FOREACH(c, nc->next) {
> - pa_log_debug("Volume change to %d at %llu was dropped", pa_cvolume_avg(&c->hw_volume), c->at);
> + pa_log_debug("Volume change to %d at %llu was dropped", pa_cvolume_avg(&c->hw_volume), (long long unsigned) c->at);
> pa_sink_volume_change_free(c);
> }
> nc->next = NULL;
> @@ -2976,7 +2976,8 @@ pa_bool_t pa_sink_volume_change_apply(pa_sink *s, pa_usec_t *usec_to_next) {
> while (s->thread_info.volume_changes && now >= s->thread_info.volume_changes->at) {
> pa_sink_volume_change *c = s->thread_info.volume_changes;
> PA_LLIST_REMOVE(pa_sink_volume_change, s->thread_info.volume_changes, c);
> - pa_log_debug("Volume change to %d at %llu was written %llu usec late", pa_cvolume_avg(&c->hw_volume), c->at, now - c->at);
> + pa_log_debug("Volume change to %d at %llu was written %llu usec late",
> + pa_cvolume_avg(&c->hw_volume), (long long unsigned) c->at, (long long unsigned) (now - c->at));
> ret = TRUE;
> s->thread_info.current_hw_volume = c->hw_volume;
> pa_sink_volume_change_free(c);
> @@ -2989,7 +2990,7 @@ pa_bool_t pa_sink_volume_change_apply(pa_sink *s, pa_usec_t *usec_to_next) {
> if (usec_to_next)
> *usec_to_next = s->thread_info.volume_changes->at - now;
> if (pa_log_ratelimit(PA_LOG_DEBUG))
> - pa_log_debug("Next volume change in %lld usec", s->thread_info.volume_changes->at - now);
> + pa_log_debug("Next volume change in %lld usec", (long long) (s->thread_info.volume_changes->at - now));
> }
> else {
> if (usec_to_next)
> @@ -3007,7 +3008,7 @@ static void pa_sink_volume_change_rewind(pa_sink *s, size_t nbytes) {
> pa_usec_t rewound = pa_bytes_to_usec(nbytes, &s->sample_spec);
> pa_usec_t limit = pa_sink_get_latency_within_thread(s);
>
> - pa_log_debug("latency = %lld", limit);
> + pa_log_debug("latency = %lld", (long long) limit);
> limit += pa_rtclock_now() + s->thread_info.volume_change_extra_delay;
>
> PA_LLIST_FOREACH(c, s->thread_info.volume_changes) {
Thanks. Applied
Col
--
Colin Guthrie
gmane(at)colin.guthr.ie
http://colin.guthr.ie/
Day Job:
Tribalogic Limited [http://www.tribalogic.net/]
Open Source:
Mageia Contributor [http://www.mageia.org/]
PulseAudio Hacker [http://www.pulseaudio.org/]
Trac Hacker [http://trac.edgewall.org/]
More information about the pulseaudio-discuss
mailing list