diff options
| author | Chris Robinson <[email protected]> | 2016-06-01 05:30:06 -0700 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2016-06-01 05:30:06 -0700 |
| commit | c63d468d4cc738ead65ff7ebc9cf6afcad400ee1 (patch) | |
| tree | c3e214e33de7470a85c1dc994e094afdcf0013b2 /Alc | |
| parent | 5e64882be9ad3e3a1552e41befef5a6216f4ecfe (diff) | |
Use a macro to specify the ambisonic periphonic channel mask
Diffstat (limited to 'Alc')
| -rw-r--r-- | Alc/bformatdec.c | 2 | ||||
| -rw-r--r-- | Alc/panning.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Alc/bformatdec.c b/Alc/bformatdec.c index a871fb09..7da50692 100644 --- a/Alc/bformatdec.c +++ b/Alc/bformatdec.c @@ -310,7 +310,7 @@ void bformatdec_reset(BFormatDec *dec, const AmbDecConf *conf, ALuint chancount, ratio = 400.0f / (ALfloat)srate; for(i = 0;i < 4;i++) bandsplit_init(&dec->UpSampler.XOver[i], ratio); - if((conf->ChanMask & ~0x831b)) + if((conf->ChanMask&AMBI_PERIPHONIC_MASK)) { dec->UpSampler.MatrixHF = CubeMatrixHF; dec->UpSampler.MatrixLF = CubeMatrixLF; diff --git a/Alc/panning.c b/Alc/panning.c index 2116e739..6949c565 100644 --- a/Alc/panning.c +++ b/Alc/panning.c @@ -673,7 +673,7 @@ static void InitHQPanning(ALCdevice *device, const AmbDecConf *conf, const ALuin if(GetConfigValueBool(devname, "decoder", "distance-comp", 1)) decflags |= BFDF_DistanceComp; - if((conf->ChanMask & ~0x831b)) + if((conf->ChanMask&AMBI_PERIPHONIC_MASK)) { count = (conf->ChanMask > 0x1ff) ? 16 : (conf->ChanMask > 0xf) ? 9 : 4; @@ -701,7 +701,7 @@ static void InitHQPanning(ALCdevice *device, const AmbDecConf *conf, const ALuin TRACE("Enabling %s-band %s-order%s ambisonic decoder\n", (conf->FreqBands == 1) ? "single" : "dual", (conf->ChanMask > 0xf) ? (conf->ChanMask > 0x1ff) ? "third" : "second" : "first", - (conf->ChanMask & ~0x831b) ? " periphonic" : "" + (conf->ChanMask&AMBI_PERIPHONIC_MASK) ? " periphonic" : "" ); bformatdec_reset(device->AmbiDecoder, conf, count, device->Frequency, speakermap, decflags); |