Moved simple methods of GOSoundOrganEngine from .cpp to .h (#2448)

Author: oleg68

src/grandorgue/sound/GOSoundOrganEngine.cpp

@@ -92,33 +92,11 @@ void GOSoundOrganEngine::SetVolume(int volume) {
   m_Gain = powf(10.0f, m_Volume * 0.05f);
 }
 
-float GOSoundOrganEngine::GetGain() { return m_Gain; }
-
-void GOSoundOrganEngine::SetSamplesPerBuffer(unsigned samples_per_buffer) {
-  m_SamplesPerBuffer = samples_per_buffer;
-}
-
-void GOSoundOrganEngine::SetSampleRate(unsigned sample_rate) {
-  m_SampleRate = sample_rate;
-}
-
-void GOSoundOrganEngine::SetInterpolationType(unsigned type) {
-  m_interpolation = (GOSoundResample::InterpolationType)type;
-}
-
 void GOSoundOrganEngine::SetHardPolyphony(unsigned polyphony) {
   m_SamplerPool.SetUsageLimit(polyphony);
   m_PolyphonySoftLimit = (m_SamplerPool.GetUsageLimit() * 3) / 4;
 }
 
-void GOSoundOrganEngine::SetPolyphonyLimiting(bool limiting) {
-  m_PolyphonyLimiting = limiting;
-}
-
-unsigned GOSoundOrganEngine::GetHardPolyphony() const {
-  return m_SamplerPool.GetUsageLimit();
-}
-
 void GOSoundOrganEngine::SetAudioGroupCount(unsigned groups) {
   if (groups < 1)
     groups = 1;
@@ -129,19 +107,7 @@ void GOSoundOrganEngine::SetAudioGroupCount(unsigned groups) {
       new GOSoundGroupTask(*this, m_SamplesPerBuffer));
 }
 
-unsigned GOSoundOrganEngine::GetAudioGroupCount() { return m_AudioGroupCount; }
-
-int GOSoundOrganEngine::GetVolume() const { return m_Volume; }
-
-void GOSoundOrganEngine::SetScaledReleases(bool enable) {
-  m_ScaledReleases = enable;
-}
-
-void GOSoundOrganEngine::SetRandomizeSpeaking(bool enable) {
-  m_RandomizeSpeaking = enable;
-}
-
-float GOSoundOrganEngine::GetRandomFactor() {
+float GOSoundOrganEngine::GetRandomFactor() const {
   if (m_RandomizeSpeaking) {
     const double factor = (pow(2, 1.0 / 1200.0) - 1) / (RAND_MAX / 2);
     int num = rand() - RAND_MAX / 2;
@@ -277,8 +243,6 @@ void GOSoundOrganEngine::ReturnSampler(GOSoundSampler *sampler) {
   m_SamplerPool.ReturnSampler(sampler);
 }
 
-GOSoundScheduler &GOSoundOrganEngine::GetScheduler() { return m_Scheduler; }
-
 void GOSoundOrganEngine::SetAudioOutput(
   std::vector<GOAudioOutputConfiguration> audio_outputs) {
   m_AudioOutputTasks.clear();
@@ -348,7 +312,7 @@ void GOSoundOrganEngine::SetupReverb(GOConfig &settings) {
 }
 
 unsigned GOSoundOrganEngine::GetBufferSizeFor(
-  unsigned outputIndex, unsigned nFrames) {
+  unsigned outputIndex, unsigned nFrames) const {
   return sizeof(float) * nFrames
     * m_AudioOutputTasks[outputIndex + 1]->GetNChannels();
 }

src/grandorgue/sound/GOSoundOrganEngine.h

@@ -117,8 +117,8 @@ class GOSoundOrganEngine : public GOSoundOrganInterface {
    * @param pSampler current playing sampler for switching to a new attack
    */
   void SwitchToAnotherAttack(GOSoundSampler *pSampler);
-  float GetRandomFactor();
-  unsigned GetBufferSizeFor(unsigned outputIndex, unsigned n_frames);
+  float GetRandomFactor() const;
+  unsigned GetBufferSizeFor(unsigned outputIndex, unsigned n_frames) const;
 
 public:
   GOSoundOrganEngine();
@@ -132,18 +132,22 @@ class GOSoundOrganEngine : public GOSoundOrganInterface {
   void SetAudioOutput(std::vector<GOAudioOutputConfiguration> audio_outputs);
   void SetupReverb(GOConfig &settings);
   void SetVolume(int volume);
-  void SetSampleRate(unsigned sample_rate);
-  void SetSamplesPerBuffer(unsigned sample_per_buffer);
-  void SetInterpolationType(unsigned type);
+  void SetSampleRate(unsigned sample_rate) { m_SampleRate = sample_rate; }
+  void SetSamplesPerBuffer(unsigned sample_per_buffer) {
+    m_SamplesPerBuffer = sample_per_buffer;
+  }
+  void SetInterpolationType(unsigned type) {
+    m_interpolation = (GOSoundResample::InterpolationType)type;
+  }
   unsigned GetSampleRate() const override { return m_SampleRate; }
   void SetAudioGroupCount(unsigned groups);
-  unsigned GetAudioGroupCount();
+  unsigned GetAudioGroupCount() const { return m_AudioGroupCount; }
   void SetHardPolyphony(unsigned polyphony);
-  void SetPolyphonyLimiting(bool limiting);
-  unsigned GetHardPolyphony() const;
-  int GetVolume() const;
-  void SetScaledReleases(bool enable);
-  void SetRandomizeSpeaking(bool enable);
+  void SetPolyphonyLimiting(bool limiting) { m_PolyphonyLimiting = limiting; }
+  unsigned GetHardPolyphony() const { return m_SamplerPool.GetUsageLimit(); }
+  int GetVolume() const { return m_Volume; }
+  void SetScaledReleases(bool enable) { m_ScaledReleases = enable; }
+  void SetRandomizeSpeaking(bool enable) { m_RandomizeSpeaking = enable; }
   const std::vector<double> &GetMeterInfo();
   void SetAudioRecorder(GOSoundRecorder *recorder, bool downmix);
 
@@ -187,14 +191,14 @@ class GOSoundOrganEngine : public GOSoundOrganInterface {
   void GetAudioOutput(
     unsigned outputIndex, bool isLast, GOSoundBufferMutable &outBuffer);
   void NextPeriod();
-  GOSoundScheduler &GetScheduler();
+  GOSoundScheduler &GetScheduler() { return m_Scheduler; }
 
   bool ProcessSampler(
     float *buffer, GOSoundSampler *sampler, unsigned n_frames, float volume);
   void ProcessRelease(GOSoundSampler *sampler);
   void PassSampler(GOSoundSampler *sampler);
   void ReturnSampler(GOSoundSampler *sampler);
-  float GetGain();
+  float GetGain() const { return m_Gain; }
   uint64_t GetTime() const { return m_CurrentTime; }
 };