summaryrefslogtreecommitdiffstats
path: root/src/modules
diff options
context:
space:
mode:
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/module-combine.c4
-rw-r--r--src/modules/module-oss.c12
2 files changed, 8 insertions, 8 deletions
diff --git a/src/modules/module-combine.c b/src/modules/module-combine.c
index 9fd12e30..d61d127a 100644
--- a/src/modules/module-combine.c
+++ b/src/modules/module-combine.c
@@ -233,7 +233,7 @@ static void time_callback(pa_mainloop_api*a, pa_time_event* e, const struct time
adjust_rates(u);
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);
}
@@ -1159,7 +1159,7 @@ int pa__init(pa_module*m) {
if (u->adjust_time > 0) {
struct timeval 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);
}
diff --git a/src/modules/module-oss.c b/src/modules/module-oss.c
index 3333eb83..23a32549 100644
--- a/src/modules/module-oss.c
+++ b/src/modules/module-oss.c
@@ -899,7 +899,7 @@ static void thread_func(void *userdata) {
ssize_t l;
pa_bool_t loop = FALSE, work_done = FALSE;
- l = u->out_fragment_size;
+ l = (ssize_t) u->out_fragment_size;
if (u->use_getospace) {
audio_buf_info info;
@@ -920,14 +920,14 @@ static void thread_func(void *userdata) {
/* Round down to multiples of the fragment size,
* because OSS needs that (at least some versions
* 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
* something, but GETOSPACE told us there was nothing?
* Hmm, make the best of it, try to read some data, to
* avoid spinning forever. */
if (l <= 0 && (revents & POLLOUT)) {
- l = u->out_fragment_size;
+ l = (ssize_t) u->out_fragment_size;
loop = FALSE;
}
@@ -1010,7 +1010,7 @@ static void thread_func(void *userdata) {
pa_memchunk memchunk;
pa_bool_t loop = FALSE, work_done = FALSE;
- l = u->in_fragment_size;
+ l = (ssize_t) u->in_fragment_size;
if (u->use_getispace) {
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)) {
- l = u->in_fragment_size;
+ l = (ssize_t) u->in_fragment_size;
loop = FALSE;
}