smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-08 15:54:57 +01:00
Code Issues Projects Releases Wiki Activity

some const'ness and hints for clang

Browse source
This commit is contained in:
Robin Gareus 2014-11-19 20:38:50 +01:00
parent cc5f5c7738
commit e3e85a92db
2 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libs/panners/vbap/vbap.cc
View file

@ -162,6 +162,8 @@ VBAPanner::compute_gains (double gains[3], int speaker_ids[3], int azi, int ele)
int i,j,k; int i,j,k;
double small_g; double small_g;
double big_sm_g, gtmp[3]; double big_sm_g, gtmp[3];
const int dimension = _speakers->dimension();
assert(dimension == 2 || dimension == 3);
spherical_to_cartesian (azi, ele, 1.0, cartdir[0], cartdir[1], cartdir[2]); spherical_to_cartesian (azi, ele, 1.0, cartdir[0], cartdir[1], cartdir[2]);
big_sm_g = -100000.0; big_sm_g = -100000.0;
@ -173,12 +175,12 @@ VBAPanner::compute_gains (double gains[3], int speaker_ids[3], int azi, int ele)
small_g = 10000000.0; small_g = 10000000.0;
for (j = 0; j < _speakers->dimension(); j++) { for (j = 0; j < dimension; j++) {
gtmp[j] = 0.0; gtmp[j] = 0.0;
for (k = 0; k < _speakers->dimension(); k++) { for (k = 0; k < dimension; k++) {
gtmp[j] += cartdir[k] * _speakers->matrix(i)[j*_speakers->dimension()+k]; gtmp[j] += cartdir[k] * _speakers->matrix(i)[j * dimension + k];
} }
if (gtmp[j] < small_g) { if (gtmp[j] < small_g) {

8
libs/panners/vbap/vbap_speakers.cc
View file

@ -559,6 +559,11 @@ VBAPSpeakers::choose_speaker_pairs (){
} }
/* sort loudspeakers according their aximuth angle */ /* sort loudspeakers according their aximuth angle */
#ifdef __clang_analyzer__
// sort_2D_lss() assigns values to all of sorted_speakers
// "uninitialized value"
memset(sorted_speakers, 0, sizeof(*sorted_speakers));
#endif
sort_2D_lss (sorted_speakers); sort_2D_lss (sorted_speakers);
/* adjacent loudspeakers are the loudspeaker pairs to be used.*/ /* adjacent loudspeakers are the loudspeaker pairs to be used.*/
@ -626,13 +631,14 @@ VBAPSpeakers::sort_2D_lss (int* sorted_speakers)
vector<Speaker> tmp = _speakers; vector<Speaker> tmp = _speakers;
vector<Speaker>::iterator s; vector<Speaker>::iterator s;
azimuth_sorter sorter; azimuth_sorter sorter;
int n; unsigned int n;
sort (tmp.begin(), tmp.end(), sorter); sort (tmp.begin(), tmp.end(), sorter);
for (n = 0, s = tmp.begin(); s != tmp.end(); ++s, ++n) { for (n = 0, s = tmp.begin(); s != tmp.end(); ++s, ++n) {
sorted_speakers[n] = (*s).id; sorted_speakers[n] = (*s).id;
} }
assert(n == _speakers.size ());
} }
int int