Remove an unused member variable.

[nageru] / theme.cpp

diff --git a/theme.cpp b/theme.cpp
index bd1259062780ae0859b65b4042fdfa644785d745..cfb9527f0dc97b6ad58324197fbac7e8afb70290 100644 (file)
--- a/theme.cpp
+++ b/theme.cpp
@@ -20,22 +20,39 @@
 #include <cstddef>
 #include <new>
 #include <utility>
+#include <memory>
 
+#include "defs.h"
 #include "image_input.h"
+#include "mixer.h"
 
 namespace movit {
 class ResourcePool;
 }  // namespace movit
 
-#define WIDTH 1280  // FIXME
-#define HEIGHT 720  // FIXME
-
 using namespace std;
 using namespace movit;
 
+extern Mixer *global_mixer;
+
 namespace {
 
-vector<LiveInputWrapper *> live_inputs;
+class LuaRefWithDeleter {
+public:
+       LuaRefWithDeleter(mutex *m, lua_State *L, int ref) : m(m), L(L), ref(ref) {}
+       ~LuaRefWithDeleter() {
+               unique_lock<mutex> lock(*m);
+               luaL_unref(L, LUA_REGISTRYINDEX, ref);
+       }
+       int get() const { return ref; }
+
+private:
+       LuaRefWithDeleter(const LuaRefWithDeleter &) = delete;
+
+       mutex *m;
+       lua_State *L;
+       int ref;
+};
 
 template<class T, class... Args>
 int wrap_lua_object(lua_State* L, const char *class_name, Args&&... args)
@@ -425,7 +442,25 @@ LiveInputWrapper::LiveInputWrapper(Theme *theme, EffectChain *chain, bool overri
 
 void LiveInputWrapper::connect_signal(int signal_num)
 {
-       theme->connect_signal(input, signal_num);
+       if (global_mixer == nullptr) {
+               return;
+       }
+
+       signal_num = theme->map_signal(signal_num);
+
+       Mixer::BufferedFrame frame = global_mixer->get_buffered_frame(signal_num, 0);
+       const PBOFrameAllocator::Userdata *userdata = (const PBOFrameAllocator::Userdata *)frame.frame->userdata;
+
+       input->set_texture_num(0, userdata->tex_y[frame.field_number]);
+       input->set_texture_num(1, userdata->tex_cbcr[frame.field_number]);
+       input->set_width(userdata->last_width[frame.field_number]);
+       input->set_height(userdata->last_height[frame.field_number]);
+
+       // Hold on to the refcount so that we don't release the input frame
+       // until we're done rendering from it.
+       if (theme->used_input_frames_collector != nullptr) {
+               theme->used_input_frames_collector->push_back(frame.frame);
+       }
 }
 
 Theme::Theme(const char *filename, ResourcePool *resource_pool, unsigned num_cards)
@@ -479,9 +514,10 @@ void Theme::register_class(const char *class_name, const luaL_Reg *funcs)
        assert(lua_gettop(L) == 0);
 }
 
-pair<EffectChain *, function<void()>>
-Theme::get_chain(unsigned num, float t, unsigned width, unsigned height)
+Theme::Chain Theme::get_chain(unsigned num, float t, unsigned width, unsigned height)
 {
+       Chain chain;
+
        unique_lock<mutex> lock(m);
        assert(lua_gettop(L) == 0);
        lua_getglobal(L, "get_chain");  /* function to be called */
@@ -490,31 +526,36 @@ Theme::get_chain(unsigned num, float t, unsigned width, unsigned height)
        lua_pushnumber(L, width);
        lua_pushnumber(L, height);
 
+       this->used_input_frames_collector = &chain.input_frames;
        if (lua_pcall(L, 4, 2, 0) != 0) {
                fprintf(stderr, "error running function `get_chain': %s\n", lua_tostring(L, -1));
                exit(1);
        }
+       this->used_input_frames_collector = nullptr;
 
-       EffectChain *chain = (EffectChain *)luaL_checkudata(L, -2, "EffectChain");
+       chain.chain = (EffectChain *)luaL_checkudata(L, -2, "EffectChain");
        if (!lua_isfunction(L, -1)) {
                fprintf(stderr, "Argument #-1 should be a function\n");
                exit(1);
        }
        lua_pushvalue(L, -1);
-       int funcref = luaL_ref(L, LUA_REGISTRYINDEX);  // TODO: leak!
+       shared_ptr<LuaRefWithDeleter> funcref(new LuaRefWithDeleter(&m, L, luaL_ref(L, LUA_REGISTRYINDEX)));
        lua_pop(L, 2);
        assert(lua_gettop(L) == 0);
-       return make_pair(chain, [this, funcref]{
+
+       chain.setup_chain = [this, funcref]{
                unique_lock<mutex> lock(m);
 
                // Set up state, including connecting signals.
-               lua_rawgeti(L, LUA_REGISTRYINDEX, funcref);
+               lua_rawgeti(L, LUA_REGISTRYINDEX, funcref->get());
                if (lua_pcall(L, 0, 0, 0) != 0) {
                        fprintf(stderr, "error running chain setup callback: %s\n", lua_tostring(L, -1));
                        exit(1);
                }
                assert(lua_gettop(L) == 0);
-       });
+       };
+
+       return chain;
 }
 
 std::string Theme::get_channel_name(unsigned channel)
@@ -586,7 +627,7 @@ std::vector<std::string> Theme::get_transition_names(float t)
        return ret;
 }      
 
-void Theme::connect_signal(YCbCrInput *input, int signal_num)
+int Theme::map_signal(int signal_num)
 {
        if (signal_num >= int(num_cards)) {
                if (signals_warned_about.insert(signal_num).second) {
@@ -595,8 +636,7 @@ void Theme::connect_signal(YCbCrInput *input, int signal_num)
                }
                signal_num %= num_cards;
        }
-       input->set_texture_num(0, input_textures[signal_num].tex_y);
-       input->set_texture_num(1, input_textures[signal_num].tex_cbcr);
+       return signal_num;
 }
 
 void Theme::transition_clicked(int transition_num, float t)