Upgrade to newer bmusb, with namespacing.

[nageru] / mixer.cpp

diff --git a/mixer.cpp b/mixer.cpp
index 4e3449b3dfdce62352299e7c7384a1d77b8bc7a4..6bc878074f2fa77e9ef9ef6da6157d54dc202eaa 100644 (file)
--- a/mixer.cpp
+++ b/mixer.cpp
@@ -46,6 +46,7 @@ class QOpenGLContext;
 using namespace movit;
 using namespace std;
 using namespace std::placeholders;
+using namespace bmusb;
 
 Mixer *global_mixer = nullptr;
 bool uses_mlock = false;
@@ -268,14 +269,12 @@ Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards)
 
        locut.init(FILTER_HPF, 2);
 
-       // If --flat-audio is given, turn off everything that messes with the sound,
-       // except the final makeup gain.
-       if (global_flags.flat_audio) {
-               set_locut_enabled(false);
-               set_gain_staging_auto(false);
-               set_limiter_enabled(false);
-               set_compressor_enabled(false);
-       }
+       set_locut_enabled(global_flags.locut_enabled);
+       set_gain_staging_db(global_flags.initial_gain_staging_db);
+       set_gain_staging_auto(global_flags.gain_staging_auto);
+       set_compressor_enabled(global_flags.compressor_enabled);
+       set_limiter_enabled(global_flags.limiter_enabled);
+       set_final_makeup_gain_auto(global_flags.final_makeup_gain_auto);
 
        // hlen=16 is pretty low quality, but we use quite a bit of CPU otherwise,
        // and there's a limit to how important the peak meter is.
@@ -716,34 +715,20 @@ void Mixer::thread_func()
                double elapsed = now.tv_sec - start.tv_sec +
                        1e-9 * (now.tv_nsec - start.tv_nsec);
                if (frame % 100 == 0) {
-               // check our memory usage, to see if we are close to our mlockall()
-               // limit (if at all set).
-               rusage used;
-               if (getrusage(RUSAGE_SELF, &used) == -1) {
-                       perror("getrusage(RUSAGE_SELF)");
-                       assert(false);
-               }
-
-               rlimit limit;
-               if (getrlimit(RLIMIT_MEMLOCK, &limit) == -1) {
-                       perror("getrlimit(RLIMIT_MEMLOCK)");
-                       assert(false);
-               }
-
                        printf("%d frames (%d dropped) in %.3f seconds = %.1f fps (%.1f ms/frame)",
                                frame, stats_dropped_frames, elapsed, frame / elapsed,
                                1e3 * elapsed / frame);
                //      chain->print_phase_timing();
 
-                       if (uses_mlock) {
-                               // Check our memory usage, to see if we are close to our mlockall()
-                               // limit (if at all set).
-                               rusage used;
-                               if (getrusage(RUSAGE_SELF, &used) == -1) {
-                                       perror("getrusage(RUSAGE_SELF)");
-                                       assert(false);
-                               }
+                       // Check our memory usage, to see if we are close to our mlockall()
+                       // limit (if at all set).
+                       rusage used;
+                       if (getrusage(RUSAGE_SELF, &used) == -1) {
+                               perror("getrusage(RUSAGE_SELF)");
+                               assert(false);
+                       }
 
+                       if (uses_mlock) {
                                rlimit limit;
                                if (getrlimit(RLIMIT_MEMLOCK, &limit) == -1) {
                                        perror("getrlimit(RLIMIT_MEMLOCK)");
@@ -754,6 +739,9 @@ void Mixer::thread_func()
                                        long(used.ru_maxrss / 1024),
                                        long(limit.rlim_cur / 1048576),
                                        float(100.0 * (used.ru_maxrss * 1024.0) / limit.rlim_cur));
+                       } else {
+                               printf(", using %ld MB memory (not locked)",
+                                       long(used.ru_maxrss / 1024));
                        }
 
                        printf("\n");