diff options
| author | Lennart Poettering <lennart@poettering.net> | 2006-01-10 17:51:06 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2006-01-10 17:51:06 +0000 |
| commit | f7a99e90470526bb28cc0c225f96490110094aed (patch) | |
| tree | cbcc4f2df6d66e180fd65ee50488545786d094f1 /polyp/module-combine.c | |
| parent | 80ae72ce45dbc23ddc360749924110dcc752491e (diff) | |
Merge Pierre's changes
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@445 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'polyp/module-combine.c')
| -rw-r--r-- | polyp/module-combine.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/polyp/module-combine.c b/polyp/module-combine.c index ca79d7df..7283c554 100644 --- a/polyp/module-combine.c +++ b/polyp/module-combine.c @@ -157,7 +157,7 @@ static void time_callback(struct pa_mainloop_api*a, struct pa_time_event* e, con adjust_rates(u); - gettimeofday(&n, NULL); + pa_gettimeofday(&n); n.tv_sec += u->adjust_time; u->sink->core->mainloop->time_restart(e, &n); } @@ -363,7 +363,7 @@ int pa__init(struct pa_core *c, struct pa_module*m) { pa_log_warn(__FILE__": WARNING: no slave sinks specified.\n"); if (u->adjust_time > 0) { - gettimeofday(&tv, NULL); + pa_gettimeofday(&tv); tv.tv_sec += u->adjust_time; u->time_event = c->mainloop->time_new(c->mainloop, &tv, time_callback, u); } |