Let the theme distinguish between fake and real inputs (ie., if there is an actual...

diff --git a/bmusb b/bmusb
index c753d698b047822c11f5f97b889649a3e582a4c9..76a878cbab84d8c3c2859b28a2363085d6a2fcb1 160000 (submodule)
--- a/bmusb
+++ b/bmusb
@@ -1 +1 @@
-Subproject commit c753d698b047822c11f5f97b889649a3e582a4c9
+Subproject commit 76a878cbab84d8c3c2859b28a2363085d6a2fcb1

diff --git a/fake_capture.cpp b/fake_capture.cpp
index 53d0db896a958303e16300bd153d2ce2cfb3bb35..5ad0b6205b41b26965a94a2fbb61afaa5e364670 100644 (file)
--- a/fake_capture.cpp
+++ b/fake_capture.cpp
@@ -195,6 +195,7 @@ void FakeCapture::producer_thread_func()
                video_format.frame_rate_nom = FAKE_FPS;
                video_format.frame_rate_den = 1;
                video_format.has_signal = true;
+               video_format.is_connected = false;
 
                FrameAllocator::Frame video_frame = video_frame_allocator->alloc_frame();
                if (video_frame.data != nullptr) {

diff --git a/mixer.cpp b/mixer.cpp
index 327ea651318049545db28b36b98a423374a6dd44..ce3ceb4bb5b8e58158eb468f5ea16e77ce40823b 100644 (file)
--- a/mixer.cpp
+++ b/mixer.cpp
@@ -506,6 +506,7 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode,
        }
        userdata->last_interlaced = video_format.interlaced;
        userdata->last_has_signal = video_format.has_signal;
+       userdata->last_is_connected = video_format.is_connected;
        userdata->last_frame_rate_nom = video_format.frame_rate_nom;
        userdata->last_frame_rate_den = video_format.frame_rate_den;
        RefCountedFrame frame(video_frame);

diff --git a/pbo_frame_allocator.cpp b/pbo_frame_allocator.cpp
index 0020ba484878ee70a0a560b885a58c9493bda9e9..74f54fd11082b4b9695338381ed01761ecc6d13a 100644 (file)
--- a/pbo_frame_allocator.cpp
+++ b/pbo_frame_allocator.cpp
@@ -45,6 +45,7 @@ PBOFrameAllocator::PBOFrameAllocator(size_t frame_size, GLuint width, GLuint hei
                userdata[i].last_height[1] = 0;
                userdata[i].last_interlaced = false;
                userdata[i].last_has_signal = false;
+               userdata[i].last_is_connected = false;
                for (unsigned field = 0; field < 2; ++field) {
                        glBindTexture(GL_TEXTURE_2D, userdata[i].tex_y[field]);
                        check_error();

diff --git a/pbo_frame_allocator.h b/pbo_frame_allocator.h
index 5dba2fc7ccf1c37ea84d0c596d1596638b31d7bd..891806a793826eaa08d14c8fbe917aca0adb9571 100644 (file)
--- a/pbo_frame_allocator.h
+++ b/pbo_frame_allocator.h
@@ -32,7 +32,7 @@ public:
                // The second set is only used for the second field of interlaced inputs.
                GLuint tex_y[2], tex_cbcr[2];
                GLuint last_width[2], last_height[2];
-               bool last_interlaced, last_has_signal;
+               bool last_interlaced, last_has_signal, last_is_connected;
                unsigned last_frame_rate_nom, last_frame_rate_den;
        };
 

diff --git a/theme.cpp b/theme.cpp
index ed187e5561189eda91a3e8e2d389a72aadec58a0..a73b60794c355d24834e3964f54b125ed7b22a52 100644 (file)
--- a/theme.cpp
+++ b/theme.cpp
@@ -46,7 +46,7 @@ struct InputStateInfo {
        InputStateInfo(const InputState& input_state);
 
        unsigned last_width[MAX_CARDS], last_height[MAX_CARDS];
-       bool last_interlaced[MAX_CARDS], last_has_signal[MAX_CARDS];
+       bool last_interlaced[MAX_CARDS], last_has_signal[MAX_CARDS], last_is_connected[MAX_CARDS];
        unsigned last_frame_rate_nom[MAX_CARDS], last_frame_rate_den[MAX_CARDS];
 };
 
@@ -58,6 +58,7 @@ InputStateInfo::InputStateInfo(const InputState &input_state)
                        last_width[signal_num] = last_height[signal_num] = 0;
                        last_interlaced[signal_num] = false;
                        last_has_signal[signal_num] = false;
+                       last_is_connected[signal_num] = false;
                        continue;
                }
                const PBOFrameAllocator::Userdata *userdata = (const PBOFrameAllocator::Userdata *)frame.frame->userdata;
@@ -65,6 +66,7 @@ InputStateInfo::InputStateInfo(const InputState &input_state)
                last_height[signal_num] = userdata->last_height[frame.field_number];
                last_interlaced[signal_num] = userdata->last_interlaced;
                last_has_signal[signal_num] = userdata->last_has_signal;
+               last_is_connected[signal_num] = userdata->last_is_connected;
                last_frame_rate_nom[signal_num] = userdata->last_frame_rate_nom;
                last_frame_rate_den[signal_num] = userdata->last_frame_rate_den;
        }
@@ -380,6 +382,16 @@ int InputStateInfo_get_has_signal(lua_State* L)
        return 1;
 }
 
+int InputStateInfo_get_is_connected(lua_State* L)
+{
+       assert(lua_gettop(L) == 2);
+       InputStateInfo *input_state_info = get_input_state_info(L, 1);
+       Theme *theme = get_theme_updata(L);
+       int signal_num = theme->map_signal(luaL_checknumber(L, 2));
+       lua_pushboolean(L, input_state_info->last_is_connected[signal_num]);
+       return 1;
+}
+
 int InputStateInfo_get_frame_rate_nom(lua_State* L)
 {
        assert(lua_gettop(L) == 2);
@@ -557,6 +569,7 @@ const luaL_Reg InputStateInfo_funcs[] = {
        { "get_height", InputStateInfo_get_height },
        { "get_interlaced", InputStateInfo_get_interlaced },
        { "get_has_signal", InputStateInfo_get_has_signal },
+       { "get_is_connected", InputStateInfo_get_is_connected },
        { "get_frame_rate_nom", InputStateInfo_get_frame_rate_nom },
        { "get_frame_rate_den", InputStateInfo_get_frame_rate_den },
        { NULL, NULL }

diff --git a/theme.lua b/theme.lua
index df9e9c7d85e5f993550226d977410645c07fb9a0..77a1ff15cde855daf459367af3be3adc764d77d4 100644 (file)
--- a/theme.lua
+++ b/theme.lua
@@ -269,7 +269,10 @@ end
 -- there's no signal.
 function get_channel_resolution(signal_num)
        res = last_resolution[signal_num]
-       if (not res) or res.height <= 0 then
+       if (not res) or not res.is_connected then
+               return "disconnected"
+       end
+       if res.height <= 0 then
                return "no signal"
        end
        if not res.has_signal then
@@ -558,6 +561,7 @@ function get_chain(num, t, width, height, signals)
                        width = signals:get_width(signal_num),
                        height = signals:get_height(signal_num),
                        interlaced = signals:get_interlaced(signal_num),
+                       is_connected = signals:get_is_connected(signal_num),
                        has_signal = signals:get_has_signal(signal_num),
                        frame_rate_nom = signals:get_frame_rate_nom(signal_num),
                        frame_rate_den = signals:get_frame_rate_den(signal_num)