Fix a deadlock issue when shutting down ALSA cards.

[nageru] / flags.h

diff --git a/flags.h b/flags.h
index edc47dd96cecff038b8a39b8f79685c63364e329..ba69db6af09cce6b0c32fbfb49740083cc7a97d6 100644 (file)
--- a/flags.h
+++ b/flags.h
@@ -3,16 +3,24 @@
 
 #include <map>
 #include <string>
+#include <vector>
 
 #include "defs.h"
 
 struct Flags {
        int num_cards = 2;
        std::string va_display;
+       bool fake_cards_audio = false;
        bool uncompressed_video_to_http = false;
        bool x264_video_to_http = false;
+       std::vector<std::string> theme_dirs { ".", "/usr/local/share/nageru" };
        std::string theme_filename = "theme.lua";
-       bool flat_audio = false;
+       bool locut_enabled = true;
+       bool gain_staging_auto = true;
+       float initial_gain_staging_db = 0.0f;
+       bool compressor_enabled = true;
+       bool limiter_enabled = true;
+       bool final_makeup_gain_auto = true;
        bool flush_pbos = true;
        std::string stream_mux_name = DEFAULT_STREAM_MUX_NAME;
        bool stream_coarse_timebase = false;
@@ -25,6 +33,7 @@ struct Flags {
        int x264_bitrate = DEFAULT_X264_OUTPUT_BIT_RATE;  // In kilobit/sec.
        int x264_vbv_max_bitrate = -1;  // In kilobits. 0 = no limit, -1 = same as <x264_bitrate> (CBR).
        int x264_vbv_buffer_size = -1;  // In kilobits. 0 = one-frame VBV, -1 = same as <x264_bitrate> (one-second VBV).
+       std::vector<std::string> x264_extra_param;  // In “key[,value]” format.
        bool enable_alsa_output = true;
        std::map<int, int> default_stream_mapping;
 };