Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

VBAP with more than 55 channels #374

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions source/VBAPUGens/VBAP.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ using nova::wrap_argument;
#endif

#define RES_ID 9171 /* resource ID for assistance (we'll add that later) */
#define MAX_LS_SETS 100 /* maximum number of loudspeaker sets (triplets or pairs) allowed */
#define MAX_LS_AMOUNT 55 /* maximum amount of loudspeakers, can be increased */
#define MAX_LS_SETS 256 /* maximum number of loudspeaker sets (triplets or pairs) allowed */
#define MAX_LS_AMOUNT 128 /* maximum amount of loudspeakers, can be increased */

static InterfaceTable *ft;

Expand All @@ -108,7 +108,7 @@ struct VBAP : Unit
float x_spread_base[3]; /* used to create uniform spreading */
float *final_gs;

float m_chanamp[MAX_LS_AMOUNT]; // for smoothing amp changes max channels 55 at the moment
float m_chanamp[MAX_LS_AMOUNT]; // for smoothing amp changes max channels 128 at the moment
};

// for circular smoothing
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ VBAPSpeakerArray.new(3, [[-22.5, 14.97], [22.5, 14.97], [-67.5, 14.97], [67.5, 1
::

method:: maxNumSpeakers
Set/get the maximum number of speakers in an array. Default is 55. (This limitation will be removed in a later version.)
Set/get the maximum number of speakers in an array. Default is 64. (This limitation will be removed in a later version.)

instancemethods::

Expand Down
2 changes: 1 addition & 1 deletion source/VBAPUGens/sc/vbap.sc
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ use or for distribution:


VBAPSpeakerArray {
classvar <>maxNumSpeakers = 55, minSideLength = 0.01;
classvar <>maxNumSpeakers = 64, minSideLength = 0.01;
var <dim, <speakers, <numSpeakers, sets;

*new { |dim, directions|
Expand Down