X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Ftheme.h;h=ce232fcfa913acb8d9eaef44c5889b4d42f62c79;hb=ecaec75dd52d076ba53cafa1fed716ebc0d93da6;hp=fe713ef1f6da48df468d4923c03a5451e23d1f27;hpb=1bf2b3e600dc5485f4957a419459b997d721e5fa;p=nageru diff --git a/nageru/theme.h b/nageru/theme.h index fe713ef..ce232fc 100644 --- a/nageru/theme.h +++ b/nageru/theme.h @@ -78,13 +78,14 @@ struct InputStateInfo { unsigned last_width[MAX_VIDEO_CARDS], last_height[MAX_VIDEO_CARDS]; bool last_interlaced[MAX_VIDEO_CARDS], last_has_signal[MAX_VIDEO_CARDS], last_is_connected[MAX_VIDEO_CARDS]; unsigned last_frame_rate_nom[MAX_VIDEO_CARDS], last_frame_rate_den[MAX_VIDEO_CARDS]; + bmusb::PixelFormat last_pixel_format[MAX_VIDEO_CARDS]; bool has_last_subtitle[MAX_VIDEO_CARDS]; std::string last_subtitle[MAX_VIDEO_CARDS]; }; class Theme { public: - Theme(const std::string &filename, const std::vector &search_dirs, movit::ResourcePool *resource_pool, unsigned num_cards); + Theme(const std::string &filename, const std::vector &search_dirs, movit::ResourcePool *resource_pool); ~Theme(); struct Chain { @@ -205,7 +206,6 @@ private: const InputState *input_state = nullptr; // Protected by . Only set temporarily, during chain setup. movit::ResourcePool *resource_pool; int num_channels = -1; - unsigned num_cards; bool startup_finished = false; std::mutex map_m;