Release Nageru 1.1.0.

[nageru] / theme.h

diff --git a/theme.h b/theme.h
index 1f4f429eec72387f44b4f3f26f56dca0a543c9a3..20d736738a89d94718c9344e624bdc253e4b3db6 100644 (file)
--- a/theme.h
+++ b/theme.h
@@ -2,8 +2,7 @@
 #define _THEME_H 1
 
 #include <epoxy/gl.h>
-#include <lauxlib.h>
-#include <lua.h>
+#include <lua.hpp>
 #include <movit/effect_chain.h>
 #include <movit/deinterlace_effect.h>
 #include <movit/ycbcr_input.h>
@@ -40,6 +39,7 @@ public:
 class Theme {
 public:
        Theme(const char *filename, movit::ResourcePool *resource_pool, unsigned num_cards);
+       ~Theme();
 
        struct Chain {
                movit::EffectChain *chain;
@@ -53,7 +53,9 @@ public:
 
        int get_num_channels() const { return num_channels; }
        int map_signal(int signal_num);
+       void set_signal_mapping(int signal_num, int card_num);
        std::string get_channel_name(unsigned channel);
+       int get_channel_signal(unsigned channel);
        bool get_supports_set_wb(unsigned channel);
        void set_wb(unsigned channel, double r, double g, double b);
 
@@ -74,7 +76,9 @@ private:
        movit::ResourcePool *resource_pool;
        int num_channels;
        unsigned num_cards;
-       std::set<int> signals_warned_about;
+
+       std::mutex map_m;
+       std::map<int, int> signal_to_card_mapping;  // Protected by <map_m>.
 
        friend class LiveInputWrapper;
 };