Remove the unused frame_length parameter to AudioMixer::add_audio().

[nageru] / nageru / audio_mixer.h

diff --git a/nageru/audio_mixer.h b/nageru/audio_mixer.h
index 9793646c9bac3493651e39643a610c7df75c5d0f..1cf4da349e71d4cc28d7c2ad5b4689f56fd7586d 100644 (file)
--- a/nageru/audio_mixer.h
+++ b/nageru/audio_mixer.h
@@ -23,7 +23,7 @@
 
 #include "alsa_pool.h"
 #include "correlation_measurer.h"
-#include "db.h"
+#include "decibel.h"
 #include "defs.h"
 #include "ebu_r128_proc.h"
 #include "filter.h"
@@ -54,9 +54,9 @@ public:
        // the lock wasn't successfully taken; if so, you should simply try again.
        // (This is to avoid a deadlock where a card hangs on the mutex in add_audio()
        // while we are trying to shut it down from another thread that also holds
-       // the mutex.) frame_length is in TIMEBASE units.
-       bool add_audio(DeviceSpec device_spec, const uint8_t *data, unsigned num_samples, bmusb::AudioFormat audio_format, int64_t frame_length, std::chrono::steady_clock::time_point frame_time);
-       bool add_silence(DeviceSpec device_spec, unsigned samples_per_frame, unsigned num_frames, int64_t frame_length);
+       // the mutex.)
+       bool add_audio(DeviceSpec device_spec, const uint8_t *data, unsigned num_samples, bmusb::AudioFormat audio_format, std::chrono::steady_clock::time_point frame_time);
+       bool add_silence(DeviceSpec device_spec, unsigned samples_per_frame, unsigned num_frames);
 
        // If a given device is offline for whatever reason and cannot deliver audio
        // (by means of add_audio() or add_silence()), you can call put it in silence mode,
@@ -208,51 +208,51 @@ public:
 
        void set_gain_staging_db(unsigned bus_index, float gain_db)
        {
-               std::unique_lock<std::mutex> lock(compressor_mutex);
+               std::lock_guard<std::mutex> lock(compressor_mutex);
                level_compressor_enabled[bus_index] = false;
                gain_staging_db[bus_index] = gain_db;
        }
 
        float get_gain_staging_db(unsigned bus_index) const
        {
-               std::unique_lock<std::mutex> lock(compressor_mutex);
+               std::lock_guard<std::mutex> lock(compressor_mutex);
                return gain_staging_db[bus_index];
        }
 
        void set_gain_staging_auto(unsigned bus_index, bool enabled)
        {
-               std::unique_lock<std::mutex> lock(compressor_mutex);
+               std::lock_guard<std::mutex> lock(compressor_mutex);
                level_compressor_enabled[bus_index] = enabled;
        }
 
        bool get_gain_staging_auto(unsigned bus_index) const
        {
-               std::unique_lock<std::mutex> lock(compressor_mutex);
+               std::lock_guard<std::mutex> lock(compressor_mutex);
                return level_compressor_enabled[bus_index];
        }
 
        void set_final_makeup_gain_db(float gain_db)
        {
-               std::unique_lock<std::mutex> lock(compressor_mutex);
+               std::lock_guard<std::mutex> lock(compressor_mutex);
                final_makeup_gain_auto = false;
                final_makeup_gain = from_db(gain_db);
        }
 
        float get_final_makeup_gain_db()
        {
-               std::unique_lock<std::mutex> lock(compressor_mutex);
+               std::lock_guard<std::mutex> lock(compressor_mutex);
                return to_db(final_makeup_gain);
        }
 
        void set_final_makeup_gain_auto(bool enabled)
        {
-               std::unique_lock<std::mutex> lock(compressor_mutex);
+               std::lock_guard<std::mutex> lock(compressor_mutex);
                final_makeup_gain_auto = enabled;
        }
 
        bool get_final_makeup_gain_auto() const
        {
-               std::unique_lock<std::mutex> lock(compressor_mutex);
+               std::lock_guard<std::mutex> lock(compressor_mutex);
                return final_makeup_gain_auto;
        }