Add a beginning UI for mapping inputs. No logic connected yet.

[nageru] / mixer.cpp

diff --git a/mixer.cpp b/mixer.cpp
index 9d418c9942622d17ba8a71fe5544bdbd61e6cb6a..b684b3d4d0e4dc404973ae4ef08c6c703599c2ac 100644 (file)
--- a/mixer.cpp
+++ b/mixer.cpp
@@ -15,6 +15,7 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <sys/resource.h>
 #include <sys/time.h>
 #include <time.h>
 #include <algorithm>
@@ -28,21 +29,19 @@
 #include <thread>
 #include <utility>
 #include <vector>
-#include <arpa/inet.h>
-#include <sys/time.h>
-#include <sys/resource.h>
 
 #include "bmusb/bmusb.h"
 #include "bmusb/fake_capture.h"
 #include "context.h"
+#include "db.h"
 #include "decklink_capture.h"
 #include "defs.h"
 #include "disk_space_estimator.h"
 #include "flags.h"
-#include "video_encoder.h"
 #include "pbo_frame_allocator.h"
 #include "ref_counted_gl_sync.h"
 #include "timebase.h"
+#include "video_encoder.h"
 
 class QOpenGLContext;
 
@@ -878,7 +877,7 @@ void Mixer::send_audio_level_callback()
        double loudness_range_low = r128.range_min();
        double loudness_range_high = r128.range_max();
 
-       audio_level_callback(loudness_s, 20.0 * log10(peak),
+       audio_level_callback(loudness_s, to_db(peak),
                loudness_i, loudness_range_low, loudness_range_high,
                audio_mixer.get_gain_staging_db(),
                audio_mixer.get_final_makeup_gain_db(),