diff options
| author | Dylan Reid <dgreid@chromium.org> | 2012-02-09 21:28:25 -0800 |
|---|---|---|
| committer | Dylan Reid <dgreid@chromium.org> | 2012-02-15 22:41:42 -0800 |
| commit | 20e15b710035bec49c83af0003fe252c02cc2a39 (patch) | |
| tree | 62a6dc349163142a9444169c9d8cabef859cc7e5 /cras/src/tests/mix_unittest.cc | |
| parent | 960cc77cb4e51e4b4c69b81b56e52a26a2025457 (diff) | |
| download | adhd-20e15b710035bec49c83af0003fe252c02cc2a39.tar.gz | |
CRAS: Rename stream volume to volume_scaler.
This is done to indicate that the volume is a scaling factor and not
an index. Keep some difference between this and the system volume
that is an index.
Change-Id: I3965f2c5410d4d197f88f4e97e3c63dcf40491e2
Signed-off-by: Dylan Reid <dgreid@chromium.org>
Diffstat (limited to 'cras/src/tests/mix_unittest.cc')
| -rw-r--r-- | cras/src/tests/mix_unittest.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cras/src/tests/mix_unittest.cc b/cras/src/tests/mix_unittest.cc index b3fc3f5e..69df0189 100644 --- a/cras/src/tests/mix_unittest.cc +++ b/cras/src/tests/mix_unittest.cc @@ -35,7 +35,7 @@ class MixTestSuite : public testing::Test{ } shm_->write_offset[0] = kBufferFrames * 4; shm_->mute = 0; - shm_->volume = 1.0; + shm_->volume_scaler = 1.0; compare_buffer_ = (int16_t *)malloc(kBufferFrames * 4); } @@ -95,7 +95,7 @@ TEST_F(MixTestSuite, MixFirstMuted) { TEST_F(MixTestSuite, MixFirstZeroVolume) { size_t count = kBufferFrames; - shm_->volume = 0.0; + shm_->volume_scaler = 0.0; cras_mix_add_stream(shm_, kNumChannels, (uint8_t *)mix_buffer_, &count, &mix_index_); EXPECT_EQ(kBufferFrames, count); @@ -110,7 +110,7 @@ TEST_F(MixTestSuite, MixFirstHalfVolume) { size_t count = kBufferFrames; int16_t *buf; - shm_->volume = 0.5; + shm_->volume_scaler = 0.5; cras_mix_add_stream(shm_, kNumChannels, (uint8_t *)mix_buffer_, &count, &mix_index_); EXPECT_EQ(kBufferFrames, count); @@ -126,12 +126,12 @@ TEST_F(MixTestSuite, MixTwoSecondHalfVolume) { size_t count = kBufferFrames; int16_t *buf; - shm_->volume = 1.0; + shm_->volume_scaler = 1.0; cras_mix_add_stream(shm_, kNumChannels, (uint8_t *)mix_buffer_, &count, &mix_index_); EXPECT_EQ(kBufferFrames, count); EXPECT_EQ(1, mix_index_); - shm_->volume = 0.5; + shm_->volume_scaler = 0.5; cras_mix_add_stream(shm_, kNumChannels, (uint8_t *)mix_buffer_, &count, &mix_index_); EXPECT_EQ(kBufferFrames, count); |