add a few missing casts

This commit is contained in:
Lennart Poettering 2008-08-20 03:33:06 +03:00
parent a3e57da0f0
commit dc9b8dce30
7 changed files with 20 additions and 20 deletions

View file

@ -233,7 +233,7 @@ static void time_callback(pa_mainloop_api*a, pa_time_event* e, const struct time
adjust_rates(u); adjust_rates(u);
pa_gettimeofday(&n); pa_gettimeofday(&n);
n.tv_sec += u->adjust_time; n.tv_sec += (time_t) u->adjust_time;
u->sink->core->mainloop->time_restart(e, &n); u->sink->core->mainloop->time_restart(e, &n);
} }
@ -1159,7 +1159,7 @@ int pa__init(pa_module*m) {
if (u->adjust_time > 0) { if (u->adjust_time > 0) {
struct timeval tv; struct timeval tv;
pa_gettimeofday(&tv); pa_gettimeofday(&tv);
tv.tv_sec += u->adjust_time; tv.tv_sec += (time_t) u->adjust_time;
u->time_event = m->core->mainloop->time_new(m->core->mainloop, &tv, time_callback, u); u->time_event = m->core->mainloop->time_new(m->core->mainloop, &tv, time_callback, u);
} }

View file

@ -899,7 +899,7 @@ static void thread_func(void *userdata) {
ssize_t l; ssize_t l;
pa_bool_t loop = FALSE, work_done = FALSE; pa_bool_t loop = FALSE, work_done = FALSE;
l = u->out_fragment_size; l = (ssize_t) u->out_fragment_size;
if (u->use_getospace) { if (u->use_getospace) {
audio_buf_info info; audio_buf_info info;
@ -920,14 +920,14 @@ static void thread_func(void *userdata) {
/* Round down to multiples of the fragment size, /* Round down to multiples of the fragment size,
* because OSS needs that (at least some versions * because OSS needs that (at least some versions
* do) */ * do) */
l = (l/u->out_fragment_size) * u->out_fragment_size; l = (l/(ssize_t) u->out_fragment_size) * (ssize_t) u->out_fragment_size;
/* Hmm, so poll() signalled us that we can read /* Hmm, so poll() signalled us that we can read
* something, but GETOSPACE told us there was nothing? * something, but GETOSPACE told us there was nothing?
* Hmm, make the best of it, try to read some data, to * Hmm, make the best of it, try to read some data, to
* avoid spinning forever. */ * avoid spinning forever. */
if (l <= 0 && (revents & POLLOUT)) { if (l <= 0 && (revents & POLLOUT)) {
l = u->out_fragment_size; l = (ssize_t) u->out_fragment_size;
loop = FALSE; loop = FALSE;
} }
@ -1010,7 +1010,7 @@ static void thread_func(void *userdata) {
pa_memchunk memchunk; pa_memchunk memchunk;
pa_bool_t loop = FALSE, work_done = FALSE; pa_bool_t loop = FALSE, work_done = FALSE;
l = u->in_fragment_size; l = (ssize_t) u->in_fragment_size;
if (u->use_getispace) { if (u->use_getispace) {
audio_buf_info info; audio_buf_info info;
@ -1024,10 +1024,10 @@ static void thread_func(void *userdata) {
} }
} }
l = (l/u->in_fragment_size) * u->in_fragment_size; l = (l/(ssize_t) u->in_fragment_size) * (ssize_t) u->in_fragment_size;
if (l <= 0 && (revents & POLLIN)) { if (l <= 0 && (revents & POLLIN)) {
l = u->in_fragment_size; l = (ssize_t) u->in_fragment_size;
loop = FALSE; loop = FALSE;
} }

View file

@ -420,7 +420,7 @@ typedef struct pa_atomic {
volatile AO_t value; volatile AO_t value;
} pa_atomic_t; } pa_atomic_t;
#define PA_ATOMIC_INIT(v) { .value = (v) } #define PA_ATOMIC_INIT(v) { .value = (AO_t) (v) }
static inline int pa_atomic_load(const pa_atomic_t *a) { static inline int pa_atomic_load(const pa_atomic_t *a) {
return (int) AO_load_full((AO_t*) &a->value); return (int) AO_load_full((AO_t*) &a->value);
@ -431,23 +431,23 @@ static inline void pa_atomic_store(pa_atomic_t *a, int i) {
} }
static inline int pa_atomic_add(pa_atomic_t *a, int i) { static inline int pa_atomic_add(pa_atomic_t *a, int i) {
return AO_fetch_and_add_full(&a->value, (AO_t) i); return (int) AO_fetch_and_add_full(&a->value, (AO_t) i);
} }
static inline int pa_atomic_sub(pa_atomic_t *a, int i) { static inline int pa_atomic_sub(pa_atomic_t *a, int i) {
return AO_fetch_and_add_full(&a->value, (AO_t) -i); return (int) AO_fetch_and_add_full(&a->value, (AO_t) -i);
} }
static inline int pa_atomic_inc(pa_atomic_t *a) { static inline int pa_atomic_inc(pa_atomic_t *a) {
return AO_fetch_and_add1_full(&a->value); return (int) AO_fetch_and_add1_full(&a->value);
} }
static inline int pa_atomic_dec(pa_atomic_t *a) { static inline int pa_atomic_dec(pa_atomic_t *a) {
return AO_fetch_and_sub1_full(&a->value); return (int) AO_fetch_and_sub1_full(&a->value);
} }
static inline int pa_atomic_cmpxchg(pa_atomic_t *a, int old_i, int new_i) { static inline int pa_atomic_cmpxchg(pa_atomic_t *a, int old_i, int new_i) {
return AO_compare_and_swap_full(&a->value, old_i, new_i); return AO_compare_and_swap_full(&a->value, (unsigned long) old_i, (unsigned long) new_i);
} }
typedef struct pa_atomic_ptr { typedef struct pa_atomic_ptr {

View file

@ -2041,7 +2041,7 @@ void *pa_will_need(const void *p, size_t l) {
return (void*) p; return (void*) p;
} }
bs = PA_PAGE_ALIGN(rlim.rlim_cur); bs = PA_PAGE_ALIGN((size_t) rlim.rlim_cur);
#else #else
bs = PA_PAGE_SIZE*4; bs = PA_PAGE_SIZE*4;
#endif #endif

View file

@ -1142,7 +1142,7 @@ static void handle_seek(playback_stream *s, int64_t indexw) {
pa_log_debug("Requesting rewind due to end of underrun."); pa_log_debug("Requesting rewind due to end of underrun.");
pa_sink_input_request_rewind(s->sink_input, pa_sink_input_request_rewind(s->sink_input,
s->sink_input->thread_info.underrun_for == (size_t) -1 ? 0 : s->sink_input->thread_info.underrun_for, (size_t) (s->sink_input->thread_info.underrun_for == (size_t) -1 ? 0 : s->sink_input->thread_info.underrun_for),
FALSE, TRUE); FALSE, TRUE);
} }

View file

@ -1178,10 +1178,10 @@ static void libsamplerate_resample(pa_resampler *r, const pa_memchunk *input, un
memset(&data, 0, sizeof(data)); memset(&data, 0, sizeof(data));
data.data_in = (float*) ((uint8_t*) pa_memblock_acquire(input->memblock) + input->index); data.data_in = (float*) ((uint8_t*) pa_memblock_acquire(input->memblock) + input->index);
data.input_frames = in_n_frames; data.input_frames = (long int) in_n_frames;
data.data_out = (float*) ((uint8_t*) pa_memblock_acquire(output->memblock) + output->index); data.data_out = (float*) ((uint8_t*) pa_memblock_acquire(output->memblock) + output->index);
data.output_frames = *out_n_frames; data.output_frames = (long int) *out_n_frames;
data.src_ratio = (double) r->o_ss.rate / r->i_ss.rate; data.src_ratio = (double) r->o_ss.rate / r->i_ss.rate;
data.end_of_input = 0; data.end_of_input = 0;

View file

@ -435,9 +435,9 @@ int pa_tagstruct_get_timeval(pa_tagstruct*t, struct timeval *tv) {
return -1; return -1;
memcpy(&tv->tv_sec, t->data+t->rindex+1, 4); memcpy(&tv->tv_sec, t->data+t->rindex+1, 4);
tv->tv_sec = ntohl((uint32_t) tv->tv_sec); tv->tv_sec = (time_t) ntohl((uint32_t) tv->tv_sec);
memcpy(&tv->tv_usec, t->data+t->rindex+5, 4); memcpy(&tv->tv_usec, t->data+t->rindex+5, 4);
tv->tv_usec = ntohl((uint32_t) tv->tv_usec); tv->tv_usec = (suseconds_t) ntohl((uint32_t) tv->tv_usec);
t->rindex += 9; t->rindex += 9;
return 0; return 0;
} }