From 3aea95d518b502e60d26f3f8100af2c20a9004ba Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 9 Oct 2008 20:45:03 +0200
Subject: Split latency paramters into "overall" and "immutable" latency

---
 src/dso.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/dso.c')

diff --git a/src/dso.c b/src/dso.c
index 71c8fd7..3e8d585 100644
--- a/src/dso.c
+++ b/src/dso.c
@@ -39,8 +39,8 @@ struct private_dso {
     int (*driver_destroy)(sa_stream *s);
 
 
-    int (*driver_change_write_latency)(sa_stream *s, size_t *latency, size_t *process_time);
-    int (*driver_change_read_latency)(sa_stream *s, size_t *latency, size_t *process_time);
+    int (*driver_change_write_latency)(sa_stream *s, size_t *overall_latency, size_t *immutable_latency, size_t *process_time);
+    int (*driver_change_read_latency)(sa_stream *s, size_t *overall_latency, size_t *process_time);
 
     int (*driver_change_device)(sa_stream *s, const char *device);
     int (*driver_change_read_volume)(sa_stream *s, const int32_t vol[]);
@@ -274,14 +274,14 @@ int driver_open(sa_stream *s) {
 
     if (!(p->driver_open = GET_FUNC_PTR(p->module, driver, "driver_open", int, (sa_stream*))) ||
         !(p->driver_destroy = GET_FUNC_PTR(p->module, driver, "driver_destroy", int, (sa_stream*))) ||
-        !(p->driver_change_write_latency = GET_FUNC_PTR(p->module, driver, "driver_change_write_latency", int, (sa_stream *s, size_t *latency, size_t *process_time))) ||
-        !(p->driver_change_read_latency = GET_FUNC_PTR(p->module, driver, "driver_change_read_latency", int, (sa_stream *s, size_t *latency, size_t *process_time))) ||
+        !(p->driver_change_write_latency = GET_FUNC_PTR(p->module, driver, "driver_change_write_latency", int, (sa_stream *, size_t *, size_t *, size_t *_time))) ||
+        !(p->driver_change_read_latency = GET_FUNC_PTR(p->module, driver, "driver_change_read_latency", int, (sa_stream *, size_t *, size_t *_time))) ||
         !(p->driver_change_device = GET_FUNC_PTR(p->module, driver, "driver_change_device", int, (sa_stream*, const char *))) ||
-        !(p->driver_change_read_volume = GET_FUNC_PTR(p->module, driver, "driver_change_read_volume", int, (sa_stream *s, const int32_t vol[]))) ||
-        !(p->driver_change_write_volume = GET_FUNC_PTR(p->module, driver, "driver_change_write_volume", int, (sa_stream *s, const int32_t vol[]))) ||
-        !(p->driver_change_pcm_rate = GET_FUNC_PTR(p->module, driver, "driver_change_pcm_rate", int, (sa_stream *s, unsigned rate))) ||
+        !(p->driver_change_read_volume = GET_FUNC_PTR(p->module, driver, "driver_change_read_volume", int, (sa_stream *s, const int32_t[]))) ||
+        !(p->driver_change_write_volume = GET_FUNC_PTR(p->module, driver, "driver_change_write_volume", int, (sa_stream *s, const int32_t[]))) ||
+        !(p->driver_change_pcm_rate = GET_FUNC_PTR(p->module, driver, "driver_change_pcm_rate", int, (sa_stream *, unsigned))) ||
         !(p->driver_change_props = GET_FUNC_PTR(p->module, driver, "driver_change_props", int, (sa_stream *, sa_proplist *, sa_proplist *))) ||
-        !(p->driver_get_state = GET_FUNC_PTR(p->module, driver, "driver_get_state", int, (sa_stream *s, sa_state_t *state))) ||
+        !(p->driver_get_state = GET_FUNC_PTR(p->module, driver, "driver_get_state", int, (sa_stream *, sa_state_t *))) ||
         !(p->driver_get_position = GET_FUNC_PTR(p->module, driver, "driver_get_position", int, (sa_stream *s, sa_position_t position, int64_t *pos))) ||
         !(p->driver_wait = GET_FUNC_PTR(p->module, driver, "driver_wait", int, (sa_stream *s))) ||
         !(p->driver_read = GET_FUNC_PTR(p->module, driver, "driver_read", int, (sa_stream *s, void *data, size_t nbytes))) ||
@@ -336,7 +336,7 @@ int driver_destroy(sa_stream *s) {
     return ret;
 }
 
-int driver_change_write_latency(sa_stream *s, size_t *latency, size_t *process_time) {
+int driver_change_write_latency(sa_stream *s, size_t *overall_latency, size_t *immutable_latency, size_t *process_time) {
     struct private_dso *p;
 
     sa_return_val_if_fail(s, SA_ERROR_INVALID);
@@ -345,7 +345,7 @@ int driver_change_write_latency(sa_stream *s, size_t *latency, size_t *process_t
     p = PRIVATE_DSO(s);
     sa_return_val_if_fail(p->driver_change_write_latency, SA_ERROR_STATE);
 
-    return p->driver_change_write_latency(s, latency, process_time);
+    return p->driver_change_write_latency(s, overall_latency, immutable_latency, process_time);
 }
 
 int driver_change_read_latency(sa_stream *s, size_t *latency, size_t *process_time) {
-- 
cgit