X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mixer.cpp;h=6bc878074f2fa77e9ef9ef6da6157d54dc202eaa;hb=08a992d58c34da8d8bbd70226f7e85c9f30d9514;hp=4035ea67351ec5abafd10337e538951910d26363;hpb=073bf315bd97c445e3e66e40d194881bbbaf9c85;p=nageru diff --git a/mixer.cpp b/mixer.cpp index 4035ea6..6bc8780 100644 --- 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.