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

'libs/panners' - Use 'std::vector' to implement arrays whose size is unknown (required to be buildable with MSVC)

Browse source
This commit is contained in:
John Emmas 2013-09-03 14:47:46 +01:00
parent 86a3910814
commit 65a4f8c2ba
1 changed files with 28 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -31,6 +31,7 @@
of the software. of the software.
*/ */
#include <vector>
#include <cmath> #include <cmath>
#include <algorithm> #include <algorithm>
#include <stdlib.h> #include <stdlib.h>
@ -45,6 +46,13 @@ using namespace std;
const double VBAPSpeakers::MIN_VOL_P_SIDE_LGTH = 0.01; const double VBAPSpeakers::MIN_VOL_P_SIDE_LGTH = 0.01;
typedef std::vector<double> DoubleVector;
typedef std::vector<float> FloatVector;
typedef std::vector<bool> BoolVector;
typedef std::vector<int> IntVector;
typedef std::vector<IntVector> IntVector2D;
typedef std::vector<DoubleVector> DoubleVector2D;
VBAPSpeakers::VBAPSpeakers (boost::shared_ptr<Speakers> s) VBAPSpeakers::VBAPSpeakers (boost::shared_ptr<Speakers> s)
: _dimension (2) : _dimension (2)
, _parent (s) , _parent (s)
@ -104,17 +112,18 @@ VBAPSpeakers::choose_speaker_triplets(struct ls_triplet_chain **ls_triplets)
int i,j,k,l,table_size; int i,j,k,l,table_size;
int n_speakers = _speakers.size (); int n_speakers = _speakers.size ();
int connections[n_speakers][n_speakers];
float distance_table[((n_speakers * (n_speakers - 1)) / 2)];
int distance_table_i[((n_speakers * (n_speakers - 1)) / 2)];
int distance_table_j[((n_speakers * (n_speakers - 1)) / 2)];
float distance;
struct ls_triplet_chain *trip_ptr, *prev, *tmp_ptr;
if (n_speakers == 0) { if (n_speakers < 1) {
return; return;
} }
FloatVector distance_table(((n_speakers * (n_speakers - 1)) / 2));
IntVector distance_table_i(((n_speakers * (n_speakers - 1)) / 2));
IntVector distance_table_j(((n_speakers * (n_speakers - 1)) / 2));
IntVector2D connections(n_speakers, IntVector(n_speakers));
float distance;
struct ls_triplet_chain *trip_ptr, *prev, *tmp_ptr;
for (i = 0; i < n_speakers; i++) { for (i = 0; i < n_speakers; i++) {
for (j = i+1; j < n_speakers; j++) { for (j = i+1; j < n_speakers; j++) {
for(k=j+1;k<n_speakers;k++) { for(k=j+1;k<n_speakers;k++) {
@ -505,25 +514,25 @@ VBAPSpeakers::choose_speaker_pairs (){
matrices and stores the data to a global array matrices and stores the data to a global array
*/ */
const int n_speakers = _speakers.size(); const int n_speakers = _speakers.size();
const double AZIMUTH_DELTA_THRESHOLD_DEGREES = (180.0/M_PI) * (M_PI - 0.175);
int sorted_speakers[n_speakers]; if (n_speakers < 1) {
bool exists[n_speakers]; return;
double inverse_matrix[n_speakers][4]; }
IntVector sorted_speakers(n_speakers);
BoolVector exists(n_speakers);
DoubleVector2D inverse_matrix(n_speakers, DoubleVector(4));
const double AZIMUTH_DELTA_THRESHOLD_DEGREES = (180.0/M_PI) * (M_PI - 0.175);
int expected_pairs = 0; int expected_pairs = 0;
int pair; int pair;
int speaker; int speaker;
if (n_speakers == 0) {
return;
}
for (speaker = 0; speaker < n_speakers; ++speaker) { for (speaker = 0; speaker < n_speakers; ++speaker) {
exists[speaker] = false; exists[speaker] = false;
} }
/* sort loudspeakers according their aximuth angle */ /* sort loudspeakers according their aximuth angle */
sort_2D_lss (sorted_speakers); sort_2D_lss (&sorted_speakers[0]);
/* adjacent loudspeakers are the loudspeaker pairs to be used.*/ /* adjacent loudspeakers are the loudspeaker pairs to be used.*/
for (speaker = 0; speaker < n_speakers-1; speaker++) { for (speaker = 0; speaker < n_speakers-1; speaker++) {
@ -532,7 +541,7 @@ VBAPSpeakers::choose_speaker_pairs (){
_speakers[sorted_speakers[speaker]].angles().azi) <= AZIMUTH_DELTA_THRESHOLD_DEGREES) { _speakers[sorted_speakers[speaker]].angles().azi) <= AZIMUTH_DELTA_THRESHOLD_DEGREES) {
if (calc_2D_inv_tmatrix( _speakers[sorted_speakers[speaker]].angles().azi, if (calc_2D_inv_tmatrix( _speakers[sorted_speakers[speaker]].angles().azi,
_speakers[sorted_speakers[speaker+1]].angles().azi, _speakers[sorted_speakers[speaker+1]].angles().azi,
inverse_matrix[speaker]) != 0){ &inverse_matrix[speaker][0]) != 0){
exists[speaker] = true; exists[speaker] = true;
expected_pairs++; expected_pairs++;
} }
@ -543,7 +552,7 @@ VBAPSpeakers::choose_speaker_pairs (){
+_speakers[sorted_speakers[0]].angles().azi) <= AZIMUTH_DELTA_THRESHOLD_DEGREES) { +_speakers[sorted_speakers[0]].angles().azi) <= AZIMUTH_DELTA_THRESHOLD_DEGREES) {
if (calc_2D_inv_tmatrix(_speakers[sorted_speakers[n_speakers-1]].angles().azi, if (calc_2D_inv_tmatrix(_speakers[sorted_speakers[n_speakers-1]].angles().azi,
_speakers[sorted_speakers[0]].angles().azi, _speakers[sorted_speakers[0]].angles().azi,
inverse_matrix[n_speakers-1]) != 0) { &inverse_matrix[n_speakers-1][0]) != 0) {
exists[n_speakers-1] = true; exists[n_speakers-1] = true;
expected_pairs++; expected_pairs++;
} }