projects
/
paraslash.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a31d410
)
audiod: Kill unused initial_delay_barrier.
author
Andre Noll
<maan@systemlinux.org>
Sun, 21 Mar 2010 10:40:10 +0000
(11:40 +0100)
committer
Andre Noll
<maan@systemlinux.org>
Sun, 21 Mar 2010 10:40:10 +0000
(11:40 +0100)
audiod.c
patch
|
blob
|
history
diff --git
a/audiod.c
b/audiod.c
index 76a6af64e00e6c5b9527cd3eff03d7ce285071e2..41fcdd8f1bc5e49ec49ff3d44369cdeb81ab4f19 100644
(file)
--- a/
audiod.c
+++ b/
audiod.c
@@
-142,7
+142,6
@@
static struct status_task status_task_struct;
* \sa struct status_task
*/
static struct status_task *stat_task = &status_task_struct;
* \sa struct status_task
*/
static struct status_task *stat_task = &status_task_struct;
-static struct timeval initial_delay_barrier;
/**
* the task for handling audiod commands
/**
* the task for handling audiod commands
@@
-713,20
+712,8
@@
static int update_item(int itemnum, char *buf)
break;
case SI_STREAM_START:
if (sscanf(buf, "%lu.%lu", &sec, &usec) == 2) {
break;
case SI_STREAM_START:
if (sscanf(buf, "%lu.%lu", &sec, &usec) == 2) {
- struct timeval a_start, delay;
- delay.tv_sec = conf.stream_delay_arg / 1000;
- delay.tv_usec = (conf.stream_delay_arg % 1000) * 1000;
stat_task->server_stream_start.tv_sec = sec;
stat_task->server_stream_start.tv_usec = usec;
stat_task->server_stream_start.tv_sec = sec;
stat_task->server_stream_start.tv_usec = usec;
- if (compute_time_diff(NULL) > 2) {
- if (stat_task->sa_time_diff_sign < 0)
- tv_add(&stat_task->server_stream_start,
- &stat_task->sa_time_diff, &a_start);
- else
- tv_diff(&stat_task->server_stream_start,
- &stat_task->sa_time_diff, &a_start);
- tv_add(&a_start, &delay, &initial_delay_barrier);
- }
}
break;
case SI_CURRENT_TIME:
}
break;
case SI_CURRENT_TIME: