summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2020-11-29 20:57:09 +0100
committerCarl Hetherington <cth@carlh.net>2020-11-29 20:57:09 +0100
commit54d45efaa9913191806144d99868a6edbe8c488c (patch)
tree342cc1a9b936a12fa0b7628ec2dc46f8cd06cae2 /src
parent48a720448779e4519b2cccae7c41ab1a618224a7 (diff)
Fix SoundFrame::get().
The old version did not deal with signed-ness correctly. I think this version is slightly dodgy in that it assumes 2s complement, but that's probably not so bad.
Diffstat (limited to 'src')
-rw-r--r--src/sound_frame.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/sound_frame.cc b/src/sound_frame.cc
index b5a52d02..53d00b38 100644
--- a/src/sound_frame.cc
+++ b/src/sound_frame.cc
@@ -50,7 +50,8 @@ int32_t
SoundFrame::get (int channel, int frame) const
{
uint8_t const * d = data() + (frame * _channels * 3) + (channel * 3);
- return d[0] | (d[1] << 8) | (d[2] << 16);
+ /* This is slightly dubious I think */
+ return (d[0] << 8 | (d[1] << 16) | (d[2] << 24)) >> 8;
}
int