Add disable_if_always_disabled() to Block objects.

[nageru] / nageru / mixer.h

diff --git a/nageru/mixer.h b/nageru/mixer.h
index de8b45741ef30cf97058d5270f995f45e1680553..69b28f58826bb7c4603107d3f7efa668b97e196c 100644 (file)
--- a/nageru/mixer.h
+++ b/nageru/mixer.h
@@ -413,7 +413,7 @@ public:
                return httpd.get_num_connected_clients();
        }
 
-       std::vector<Theme::MenuEntry> get_theme_menu() { return theme->get_theme_menu(); }
+       Theme::MenuEntry *get_theme_menu() { return theme->get_theme_menu(); }
 
        void theme_menu_entry_clicked(int lua_ref) { return theme->theme_menu_entry_clicked(lua_ref); }
 
@@ -456,7 +456,7 @@ private:
        HTTPD httpd;
        unsigned num_cards, num_video_inputs, num_html_inputs = 0;
 
-       QSurface *mixer_surface, *h264_encoder_surface, *decklink_output_surface;
+       QSurface *mixer_surface, *h264_encoder_surface, *decklink_output_surface, *image_update_surface;
        std::unique_ptr<movit::ResourcePool> resource_pool;
        std::unique_ptr<Theme> theme;
        std::atomic<unsigned> audio_source_channel{0};