diff options
| author | Jorge E. Moreira <jemoreira@google.com> | 2021-04-09 16:07:03 -0700 |
|---|---|---|
| committer | Jorge E. Moreira <jemoreira@google.com> | 2021-04-09 16:07:03 -0700 |
| commit | 072dce8ca50bdf87b113490cdf14bde14724914f (patch) | |
| tree | 7e0e07b9d8d50fc5dd352d5b36d74fa3cb3427db /cras/src/server/dev_io.h | |
| parent | 0aaab56eba431583969e73f177a0efdcebf46cac (diff) | |
| parent | 3624a4296888926a21462bfd499d4ba91268046b (diff) | |
| download | adhd-072dce8ca50bdf87b113490cdf14bde14724914f.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-main' into masterandroid-s-beta-2android-s-beta-1main-cg-testing-release
This merge is necessary to update crosvm to the latest version
Bug: 163867676
Test: locally
Change-Id: Ia0681ee12911ac60f44b04008c5a0590032733a3
Diffstat (limited to 'cras/src/server/dev_io.h')
| -rw-r--r-- | cras/src/server/dev_io.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cras/src/server/dev_io.h b/cras/src/server/dev_io.h index 259bbabd..ca71a809 100644 --- a/cras/src/server/dev_io.h +++ b/cras/src/server/dev_io.h @@ -58,8 +58,9 @@ int write_output_samples(struct open_dev **odevs, struct open_dev *adev, * Captures samples from each device in the list. * list - Pointer to the list of input devices. Devices that fail to read * will be removed from the list. + * olist - Pointer to the list of output devices. */ -int dev_io_capture(struct open_dev **list); +int dev_io_capture(struct open_dev **list, struct open_dev **olist); /* * Send samples that have been captured to their streams. @@ -101,7 +102,7 @@ struct open_dev *dev_io_find_open_dev(struct open_dev *odev_list, unsigned int dev_idx); /* Append a new stream to a specified set of iodevs. */ -int dev_io_append_stream(struct open_dev **dev_list, +int dev_io_append_stream(struct open_dev **odevs, struct open_dev **idevs, struct cras_rstream *stream, struct cras_iodev **iodevs, unsigned int num_iodevs); |