X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fmixer.h;h=99385faeffc00430968ecbc1a40bc40acc286dfa;hb=5e77e932e6a5795882ecba1b3f62a26523863179;hp=6e9da90c3c0e1a27bc830a18acd1407cf6cfc1f0;hpb=c4497a099d6a01ff2eedb483c2589ef70e7c657c;p=nageru diff --git a/nageru/mixer.h b/nageru/mixer.h index 6e9da90..99385fa 100644 --- a/nageru/mixer.h +++ b/nageru/mixer.h @@ -326,6 +326,10 @@ public: desired_output_card_index = card_index; } + bool get_output_card_is_master() const { + return output_card_is_master; + } + std::map get_available_output_video_modes() const; uint32_t get_output_video_mode() const { @@ -396,9 +400,10 @@ private: std::unique_ptr resource_pool; std::unique_ptr theme; std::atomic audio_source_channel{0}; - std::atomic master_clock_channel{0}; // Gets overridden by if set. + std::atomic master_clock_channel{0}; // Gets overridden by if output_card_is_master == true. int output_card_index = -1; // -1 for none. uint32_t output_video_mode = -1; + bool output_card_is_master = false; // Only relevant if output_card_index != -1. // The mechanics of changing the output card and modes are so intricately connected // with the work the mixer thread is doing. Thus, we don't change it directly,