Mercurial > hg > svcore
comparison base/AudioLevel.cpp @ 259:dc46851837d6
* Fix many compile warnings, remove some debug output
author | Chris Cannam |
---|---|
date | Mon, 30 Apr 2007 13:36:23 +0000 |
parents | 8133ae938704 |
children | bdc9bb371a9f |
comparison
equal
deleted
inserted
replaced
258:96a6dd889c68 | 259:dc46851837d6 |
---|---|
43 FaderDescription(-70.f, 0.f, 1.00f), // IEC268 | 43 FaderDescription(-70.f, 0.f, 1.00f), // IEC268 |
44 FaderDescription(-70.f, +10.f, 0.80f), // IEC268 long | 44 FaderDescription(-70.f, +10.f, 0.80f), // IEC268 long |
45 FaderDescription(-40.f, 0.f, 1.00f), // preview | 45 FaderDescription(-40.f, 0.f, 1.00f), // preview |
46 }; | 46 }; |
47 | 47 |
48 typedef std::vector<float> LevelList; | 48 //typedef std::vector<float> LevelList; |
49 static std::map<int, LevelList> previewLevelCache; | 49 //static std::map<int, LevelList> previewLevelCache; |
50 static const LevelList &getPreviewLevelCache(int levels); | 50 //static const LevelList &getPreviewLevelCache(int levels); |
51 | 51 |
52 float | 52 float |
53 AudioLevel::multiplier_to_dB(float multiplier) | 53 AudioLevel::multiplier_to_dB(float multiplier) |
54 { | 54 { |
55 if (multiplier == 0.f) return DB_FLOOR; | 55 if (multiplier == 0.f) return DB_FLOOR; |
217 float dB = multiplier_to_dB(multiplier); | 217 float dB = multiplier_to_dB(multiplier); |
218 int fader = dB_to_fader(dB, maxLevel, type); | 218 int fader = dB_to_fader(dB, maxLevel, type); |
219 return fader; | 219 return fader; |
220 } | 220 } |
221 | 221 |
222 | 222 /* |
223 const LevelList & | 223 const LevelList & |
224 getPreviewLevelCache(int levels) | 224 getPreviewLevelCache(int levels) |
225 { | 225 { |
226 LevelList &ll = previewLevelCache[levels]; | 226 LevelList &ll = previewLevelCache[levels]; |
227 if (ll.empty()) { | 227 if (ll.empty()) { |
232 ll.push_back(m); | 232 ll.push_back(m); |
233 } | 233 } |
234 } | 234 } |
235 return ll; | 235 return ll; |
236 } | 236 } |
237 */ | |
237 | 238 |
238 int | 239 int |
239 AudioLevel::multiplier_to_preview(float m, int levels) | 240 AudioLevel::multiplier_to_preview(float m, int levels) |
240 { | 241 { |
241 assert(levels > 0); | 242 assert(levels > 0); |