Skip to content

Commit 31f1ad9

Browse files
camillegcamilleg
committed
extraneous inlines
1 parent 83f104a commit 31f1ad9

39 files changed

+305
-755
lines changed

‎VActor.h

+4-12
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,8 @@ typedef unsigned ActorHandle;
1212
class VHandler;
1313
class VGeneratorActor;
1414

15-
// Base class for all Actors.
16-
//
1715
// Actors are automatically maintained in a map. They insert
1816
// themselves when created and remove themselves when deleted.
19-
//
20-
// Copyright (C) Sumit Das, 1994
21-
// Updated by Camille and Kelly 1996
22-
//
2317
class VActor
2418
{
2519
ActorHandle myHandle;
@@ -76,19 +70,17 @@ class VActor
7670
static void allAct();
7771
static void allActCleanup();
7872

79-
// Message handling:
80-
// Derived classes that receive messages should override receiveMessage().
81-
// They should not fail to call their base class' receiveMessage() for
82-
// messages that they do not understand.
73+
// A derived class's version must call the base class's
74+
// version for messages that it does not recognize.
8375
virtual int receiveMessage(const char* Message);
8476

8577
// Catch() and Uncatch() are used in message parsing.
8678
// Catch() when a message is handled succesfully, Uncatch()
8779
// when a message is caught, but handled unsuccessfully (i.e.
8880
// has wrong number of arguments or something).
8981
protected:
90-
inline int Catch();
91-
inline int Uncatch();
82+
int Catch();
83+
int Uncatch();
9284

9385
// Global VActor container access and maintenance.
9486
private:

‎VAlgorithm.c++

+56-100
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#include "VAlgorithm.h"
22

33
// #define NDEBUG // Disable assert().
4+
#include <algorithm>
45
#include <cassert>
56

67
#ifdef VSS_WINDOWS
@@ -19,7 +20,7 @@
1920
// Instances of algorithms.
2021
VAlgorithmList VAlgorithm::Generators;
2122

22-
VAlgorithm::VAlgorithm(void) :
23+
VAlgorithm::VAlgorithm() :
2324
mute(false),
2425
pause(false),
2526
nchan(1),
@@ -75,19 +76,16 @@ VAlgorithm::VAlgorithm(void) :
7576
hpf_d.setHiAllLopassGain(1., 0., 0.);
7677
}
7778

78-
VAlgorithm::~VAlgorithm()
79-
{
79+
VAlgorithm::~VAlgorithm() {
8080
// remove the dead generator from the list
8181
Generators.erase(position);
8282
}
8383

84-
void VAlgorithm::invertAmp(int fInvert)
85-
{
84+
void VAlgorithm::invertAmp(int fInvert) {
8685
fInvertAmp = fInvert;
8786
}
8887

89-
void VAlgorithm::setAmp(float a, float t)
90-
{
88+
void VAlgorithm::setAmp(float a, float t) {
9189
if (!fLinearEnv)
9290
{
9391
setGain(dBFromScalar(a), t);
@@ -111,9 +109,7 @@ void VAlgorithm::setAmp(float a, float t)
111109
}
112110
}
113111

114-
void
115-
VAlgorithm::setGain(float a, float t)
116-
{
112+
void VAlgorithm::setGain(float a, float t) {
117113
if (fLinearEnv)
118114
{
119115
setAmp(ScalarFromdB(a), t);
@@ -137,8 +133,7 @@ VAlgorithm::setGain(float a, float t)
137133
}
138134
}
139135

140-
void VAlgorithm::scaleAmp(float a, float t)
141-
{
136+
void VAlgorithm::scaleAmp(float a, float t) {
142137
if (!fLinearEnv)
143138
{
144139
scaleGain(dBFromScalar(a), t);
@@ -160,9 +155,7 @@ void VAlgorithm::scaleAmp(float a, float t)
160155
}
161156
}
162157

163-
void
164-
VAlgorithm::scaleGain(float a, float t)
165-
{
158+
void VAlgorithm::scaleGain(float a, float t) {
166159
if (fLinearEnv)
167160
{
168161
scaleAmp(ScalarFromdB(a), t);
@@ -184,8 +177,7 @@ VAlgorithm::scaleGain(float a, float t)
184177
}
185178
}
186179

187-
void VAlgorithm::setInputAmp(float a, float t)
188-
{
180+
void VAlgorithm::setInputAmp(float a, float t) {
189181
if (!fLinearEnv)
190182
{
191183
setInputGain(dBFromScalar(a), t);
@@ -206,8 +198,7 @@ void VAlgorithm::setInputAmp(float a, float t)
206198
}
207199
}
208200

209-
void VAlgorithm::setInputGain(float a, float t)
210-
{
201+
void VAlgorithm::setInputGain(float a, float t) {
211202
if (fLinearEnv)
212203
{
213204
setInputAmp(ScalarFromdB(a), t);
@@ -229,12 +220,11 @@ void VAlgorithm::setInputGain(float a, float t)
229220
}
230221
}
231222

232-
static inline float NormalizePan(float a)
233-
{
234-
float _ = fmod(a, 2.0f); // 0 to 1.999 if a>0, -1.999 to 0 if a<0.
235-
236-
return globs.nchansVSS<4?(a<-1.?-1.:a>1.?1.:a):(_<-1.?_+2.:_>1.?_-2.:_);
237-
// Real programmers can write APL in *any* language.
223+
static double NormalizePan(double a) {
224+
if (globs.nchansVSS < 4)
225+
return std::clamp(a, -1.0, 1.0);
226+
const auto _ = fmod(a, 2.0); // 0 to 1.999 if a>0, -1.999 to 0 if a<0.
227+
return _<-1.0 ? _+2.0 : _>1.0 ? _-2.0 : _;
238228
}
239229

240230
// Quad: -1 to 1 is left-rear through left, front, right, right-rear.
@@ -244,21 +234,18 @@ static inline float NormalizePan(float a)
244234
// (thanks to Carlos Ricci for the sqrt idea).
245235
// Compute the sqrt lazily (don't bother, if we were going to return 0 anyway).
246236

247-
static inline float PanIt(float _, float __)
248-
{
249-
float x = 1. - 2.*fabs(NormalizePan(_) - __);
250-
return x > 0. ? fsqrt(x) : 0.;
237+
static double PanIt(double _, double __) {
238+
const auto x = 1.0 - 2.0*fabs(NormalizePan(_) - __);
239+
return x > 0.0 ? sqrt(x) : 0.0;
251240
}
252-
253-
static inline float PanFL(float _) { return PanIt(_, -.25); }
254-
static inline float PanFR(float _) { return PanIt(_, .25); }
255-
static inline float PanRL(float _) { return PanIt(_, -.75) + PanIt(_, 1.25); }
256-
static inline float PanRR(float _) { return PanIt(_, .75) + PanIt(_, -1.25); }
241+
static double PanFL(double _) { return PanIt(_, -.25); }
242+
static double PanFR(double _) { return PanIt(_, .25); }
243+
static double PanRL(double _) { return PanIt(_, -.75) + PanIt(_, 1.25); }
244+
static double PanRR(double _) { return PanIt(_, .75) + PanIt(_, -1.25); }
257245
// the 2 cases for RL and RR are to handle both sheets of the multiple covering
258246

259247
// Set panAmps[] from pan.
260-
inline void VAlgorithm::setPanImmediately(int nchans)
261-
{
248+
void VAlgorithm::setPanImmediately(int nchans) {
262249
if (fSetAmplsDirectly)
263250
return;
264251

@@ -287,39 +274,31 @@ inline void VAlgorithm::setPanImmediately(int nchans)
287274
}
288275
}
289276

290-
inline void VAlgorithm::setElevImmediately(int nchans)
291-
{
292-
if (fSetAmplsDirectly)
277+
void VAlgorithm::setElevImmediately(int nchans) {
278+
if (fSetAmplsDirectly || nchans != 8)
293279
return;
294280

295-
if (nchans == 8)
296-
{
297-
// Like Quad, where pan is azimuth, and elev is elevation.
298-
299-
float FL = PanFL(pan);
300-
float FR = PanFR(pan);
301-
float RL = PanRL(pan);
302-
float RR = PanRR(pan);
303-
304-
float elevBot = fabs(elev - 1) * .5f;
305-
float elevTop = 1.f - elevBot;
306-
307-
panAmps[0] = FL * elevTop;
308-
panAmps[1] = FR * elevTop;
309-
panAmps[2] = RL * elevTop;
310-
panAmps[3] = RR * elevTop;
311-
panAmps[4] = FL * elevBot;
312-
panAmps[5] = FR * elevBot;
313-
panAmps[6] = RL * elevBot;
314-
panAmps[7] = RR * elevBot;
315-
}
281+
// Like Quad, where pan is azimuth, and elev is elevation.
282+
const auto FL = PanFL(pan);
283+
const auto FR = PanFR(pan);
284+
const auto RL = PanRL(pan);
285+
const auto RR = PanRR(pan);
286+
287+
const auto elevBot = fabs(elev - 1) * 0.5;
288+
const auto elevTop = 1.0 - elevBot;
289+
290+
panAmps[0] = FL * elevTop;
291+
panAmps[1] = FR * elevTop;
292+
panAmps[2] = RL * elevTop;
293+
panAmps[3] = RR * elevTop;
294+
panAmps[4] = FL * elevBot;
295+
panAmps[5] = FR * elevBot;
296+
panAmps[6] = RL * elevBot;
297+
panAmps[7] = RR * elevBot;
316298
}
317299

318-
inline void VAlgorithm::setDistanceImmediately(void)
319-
{
320-
dist01 = distance / distanceHorizon;
321-
if (dist01 < 0.)
322-
dist01 = 0.;
300+
void VAlgorithm::setDistanceImmediately() {
301+
dist01 = std::max(0.0f, distance / distanceHorizon);
323302

324303
#ifdef ONE_WAY_TO_DO_IT
325304
// inverse-1.2 law
@@ -360,9 +339,7 @@ inline void VAlgorithm::setDistanceImmediately(void)
360339
hpf_d.setFrequency(10.0 * pow(2.0, 4.0*dist01));
361340
}
362341

363-
void
364-
VAlgorithm::setPan(float a, float t)
365-
{
342+
void VAlgorithm::setPan(float a, float t) {
366343
if (fSetAmplsDirectly)
367344
return;
368345

@@ -410,9 +387,7 @@ VAlgorithm::setPan(float a, float t)
410387
}
411388
}
412389

413-
void
414-
VAlgorithm::setElev(float a, float t)
415-
{
390+
void VAlgorithm::setElev(float a, float t) {
416391
if (fSetAmplsDirectly)
417392
return;
418393

@@ -432,8 +407,7 @@ VAlgorithm::setElev(float a, float t)
432407
}
433408
}
434409

435-
void VAlgorithm::setDistance(float a, float t)
436-
{
410+
void VAlgorithm::setDistance(float a, float t) {
437411
if (fSetAmplsDirectly)
438412
return;
439413

@@ -453,20 +427,14 @@ void VAlgorithm::setDistance(float a, float t)
453427
}
454428
}
455429

456-
457-
void VAlgorithm::setDistanceHorizon(float a)
458-
{
459-
if (a < .0001)
460-
a = .0001;
461-
distanceHorizon = a;
430+
void VAlgorithm::setDistanceHorizon(float a) {
431+
distanceHorizon = std::max(0.0001f, a);
462432
}
463433

464434

465435
// Computes the new (modulated) amplitude values
466436
// in place, and halts modulation if necessary.
467-
inline void
468-
VAlgorithm::updateAmps(int nchans)
469-
{
437+
void VAlgorithm::updateAmps(int nchans) {
470438
assert(!getPause());
471439

472440
if (fLinearEnv)
@@ -570,9 +538,7 @@ VAlgorithm::updateAmps(int nchans)
570538
}
571539
}
572540

573-
inline void
574-
VAlgorithm::updateDistance(void)
575-
{
541+
void VAlgorithm::updateDistance() {
576542
assert(!getPause());
577543
if (modDistance > 0L)
578544
{
@@ -591,9 +557,7 @@ VAlgorithm::updateDistance(void)
591557
// Utility functions to handle pause and mute states,
592558
// for classes with overridden outputSamples().
593559
// ProcessorActors commonly pass in (source != NULL) for fValidForOutput.
594-
int
595-
VAlgorithm::FOutputSamples1(int howMany, int fValidForOutput)
596-
{
560+
int VAlgorithm::FOutputSamples1(int howMany, int fValidForOutput) {
597561
if (!fValidForOutput || getPause())
598562
{
599563
// fill local buffer with zeros, in case anyone's listening
@@ -603,9 +567,7 @@ VAlgorithm::FOutputSamples1(int howMany, int fValidForOutput)
603567
return 1;
604568
}
605569

606-
int
607-
VAlgorithm::FOutputSamples2(int /*howMany*/, int nchans)
608-
{
570+
int VAlgorithm::FOutputSamples2(int /*howMany*/, int nchans) {
609571
if (getMute() && !fSetAmplsDirectly)
610572
{
611573
for (int iChunk = 0; iChunk < cChunk; iChunk++)
@@ -621,9 +583,7 @@ VAlgorithm::FOutputSamples2(int /*howMany*/, int nchans)
621583
// OutputSamples 3,4
622584
// Functions to map the computed buffer of samples to the vss output channels,
623585
// then fade, scale, and pan the mapped result onto the vss output busses
624-
inline void
625-
VAlgorithm::OutputSamples3(int howMany, float* putEmHere, int nchans)
626-
{
586+
void VAlgorithm::OutputSamples3(int howMany, float* putEmHere, int nchans) {
627587
VCircularBuffer* p;
628588
int nchansAlgorithm = Nchan();
629589
VCircularBuffer bufferMono;
@@ -711,9 +671,7 @@ VAlgorithm::OutputSamples3(int howMany, float* putEmHere, int nchans)
711671
//;;;; if (nothing's changing /*updateAmps isn't doing anything*/)
712672
//;;;; { cChunk=1; csampChunk=howMany; }
713673

714-
inline void
715-
VAlgorithm::OutputSamples4(int howMany, float* putEmHere, int nchansAlgorithm, int nchans, VCircularBuffer& bufArg)
716-
{
674+
void VAlgorithm::OutputSamples4(int howMany, float* putEmHere, int nchansAlgorithm, int nchans, VCircularBuffer& bufArg) {
717675
assert(howMany == MaxSampsPerBuffer);
718676
assert(howMany == cChunk * csampChunk);
719677
assert(nchans == 1 || nchans == 2 || nchans == 4 || nchans == 8);
@@ -816,9 +774,7 @@ VAlgorithm::OutputSamples4(int howMany, float* putEmHere, int nchansAlgorithm, i
816774
// for copying and scaling their samples into putEmHere[]).
817775
//
818776
// Update amplitudes every sample.
819-
void
820-
VAlgorithm::outputSamples( int howMany, float* putEmHere, int nchans )
821-
{
777+
void VAlgorithm::outputSamples(int howMany, float* putEmHere, int nchans) {
822778
if (!FOutputSamples1(howMany, FValidForOutput()))
823779
return;
824780

0 commit comments

Comments
 (0)