summaryrefslogtreecommitdiff
path: root/cras/src/tests/alsa_io_unittest.cc
diff options
context:
space:
mode:
authorJorge E. Moreira <jemoreira@google.com>2021-02-08 17:59:31 -0800
committerJorge E. Moreira <jemoreira@google.com>2021-02-08 17:59:31 -0800
commitdc2b74a983c1182f9f4e05a8e6e91beb04792c51 (patch)
tree8c44572911d479dc6dca87dd1cc2e9eca46500ba /cras/src/tests/alsa_io_unittest.cc
parentc8f8b3cd94220d03fcdee753d8fc762224c3d177 (diff)
parent9668bb7e705f4102e0558c522f1488a966a51826 (diff)
downloadadhd-dc2b74a983c1182f9f4e05a8e6e91beb04792c51.tar.gz
Merge branch 'upstream-master'
Change-Id: I25af576b68bcd95ee401067ee798e963f9a96264
Diffstat (limited to 'cras/src/tests/alsa_io_unittest.cc')
-rw-r--r--cras/src/tests/alsa_io_unittest.cc8
1 files changed, 1 insertions, 7 deletions
diff --git a/cras/src/tests/alsa_io_unittest.cc b/cras/src/tests/alsa_io_unittest.cc
index ba650a2f..b3059a23 100644
--- a/cras/src/tests/alsa_io_unittest.cc
+++ b/cras/src/tests/alsa_io_unittest.cc
@@ -137,7 +137,6 @@ static int cras_iodev_frames_queued_ret;
static int cras_iodev_buffer_avail_ret;
static int cras_alsa_resume_appl_ptr_called;
static int cras_alsa_resume_appl_ptr_ahead;
-static int ucm_get_enable_htimestamp_flag_ret;
static const struct cras_volume_curve* fake_get_dBFS_volume_curve_val;
static int cras_iodev_dsp_set_swap_mode_for_node_called;
static std::map<std::string, long> ucm_get_default_node_gain_values;
@@ -220,7 +219,6 @@ void ResetStubData() {
cras_iodev_buffer_avail_ret = 0;
cras_alsa_resume_appl_ptr_called = 0;
cras_alsa_resume_appl_ptr_ahead = 0;
- ucm_get_enable_htimestamp_flag_ret = 0;
fake_get_dBFS_volume_curve_val = NULL;
cras_iodev_dsp_set_swap_mode_for_node_called = 0;
ucm_get_default_node_gain_values.clear();
@@ -2473,7 +2471,7 @@ int cras_alsa_set_hwparams(snd_pcm_t* handle,
unsigned int dma_period_time) {
return 0;
}
-int cras_alsa_set_swparams(snd_pcm_t* handle, int* enable_htimestamp) {
+int cras_alsa_set_swparams(snd_pcm_t* handle) {
return 0;
}
int cras_alsa_get_avail_frames(snd_pcm_t* handle,
@@ -2768,10 +2766,6 @@ int ucm_get_min_buffer_level(struct cras_use_case_mgr* mgr,
return 0;
}
-unsigned int ucm_get_enable_htimestamp_flag(struct cras_use_case_mgr* mgr) {
- return ucm_get_enable_htimestamp_flag_ret;
-}
-
unsigned int ucm_get_disable_software_volume(struct cras_use_case_mgr* mgr) {
return 0;
}