-Subproject commit c753d698b047822c11f5f97b889649a3e582a4c9
+Subproject commit 76a878cbab84d8c3c2859b28a2363085d6a2fcb1
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) {
}
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);
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();
// 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;
};
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];
};
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;
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;
}
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);
{ "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 }
-- 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
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)