From 0490c42536a845dd6d718a7c58cfb3e3ab02b1ab Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Sat, 29 Feb 2020 22:30:30 +0100 Subject: [PATCH] Nomenclature cleanups around channels, signals and cards. --- nageru/glwidget.cpp | 4 +-- nageru/mixer.cpp | 2 +- nageru/mixer.h | 8 ++--- nageru/scene.cpp | 2 +- nageru/theme.cpp | 84 ++++++++++++++++++++++----------------------- nageru/theme.h | 6 ++-- 6 files changed, 53 insertions(+), 53 deletions(-) diff --git a/nageru/glwidget.cpp b/nageru/glwidget.cpp index d3e1d56..9aae03b 100644 --- a/nageru/glwidget.cpp +++ b/nageru/glwidget.cpp @@ -174,7 +174,7 @@ void GLWidget::show_context_menu(const QPoint &pos) show_live_context_menu(pos); } if (output >= Mixer::OUTPUT_INPUT0) { - int signal_num = global_mixer->get_channel_signal(output); + int signal_num = global_mixer->map_channel_to_signal(output); if (signal_num != -1) { show_preview_context_menu(signal_num, pos); } @@ -228,7 +228,7 @@ void GLWidget::show_preview_context_menu(unsigned signal_num, const QPoint &pos) QActionGroup mode_group(&mode_submenu); unsigned num_cards = global_mixer->get_num_cards(); - unsigned current_card = global_mixer->map_signal(signal_num); + unsigned current_card = global_mixer->map_signal_to_card(signal_num); bool is_ffmpeg = global_mixer->card_is_ffmpeg(current_card); if (!is_ffmpeg) { // FFmpeg inputs are not connected to any card; they're locked to a given input and have a given Y'CbCr interpretatio and have a given Y'CbCr interpretationn. diff --git a/nageru/mixer.cpp b/nageru/mixer.cpp index 255f28a..464b920 100644 --- a/nageru/mixer.cpp +++ b/nageru/mixer.cpp @@ -1077,7 +1077,7 @@ void Mixer::thread_func() master_card_index = output_card_index; } else { master_card_is_output = false; - master_card_index = theme->map_signal(master_clock_channel); + master_card_index = theme->map_signal_to_card(master_clock_channel); assert(master_card_index < num_cards + num_video_inputs); } diff --git a/nageru/mixer.h b/nageru/mixer.h index 49afa7f..61db4a5 100644 --- a/nageru/mixer.h +++ b/nageru/mixer.h @@ -251,14 +251,14 @@ public: return theme->get_channel_color(channel); } - int get_channel_signal(unsigned channel) const + int map_channel_to_signal(unsigned channel) const { - return theme->get_channel_signal(channel); + return theme->map_channel_to_signal(channel); } - int map_signal(unsigned channel) + int map_signal_to_card(int signal) { - return theme->map_signal(channel); + return theme->map_signal_to_card(signal); } unsigned get_master_clock() const diff --git a/nageru/scene.cpp b/nageru/scene.cpp index f4320b4..ca6cc70 100644 --- a/nageru/scene.cpp +++ b/nageru/scene.cpp @@ -737,7 +737,7 @@ bool display(Block *block, lua_State *L, int idx) Theme *theme = get_theme_updata(L); int signal_idx = luaL_checknumber(L, idx); block->signal_type_to_connect = Block::CONNECT_SIGNAL; - block->signal_to_connect = theme->map_signal(signal_idx); + block->signal_to_connect = theme->map_signal_to_card(signal_idx); // FIXME: Assigning a card to something named about signals. block->currently_chosen_alternative = find_index_of(block, LIVE_INPUT_YCBCR); // Will be changed to deinterlaced at get_chain() time if needed. return true; #ifdef HAVE_CEF diff --git a/nageru/theme.cpp b/nageru/theme.cpp index 71d6000..65d82da 100644 --- a/nageru/theme.cpp +++ b/nageru/theme.cpp @@ -627,8 +627,8 @@ int InputStateInfo_get_width(lua_State* L) 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_pushnumber(L, input_state_info->last_width[signal_num]); + int card_idx = theme->map_signal_to_card(luaL_checknumber(L, 2)); + lua_pushnumber(L, input_state_info->last_width[card_idx]); return 1; } @@ -637,8 +637,8 @@ int InputStateInfo_get_height(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_pushnumber(L, input_state_info->last_height[signal_num]); + int card_idx = theme->map_signal_to_card(luaL_checknumber(L, 2)); + lua_pushnumber(L, input_state_info->last_height[card_idx]); return 1; } @@ -647,9 +647,9 @@ int InputStateInfo_get_frame_height(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)); - unsigned height = input_state_info->last_height[signal_num]; - if (input_state_info->last_interlaced[signal_num]) { + int card_idx = theme->map_signal_to_card(luaL_checknumber(L, 2)); + unsigned height = input_state_info->last_height[card_idx]; + if (input_state_info->last_interlaced[card_idx]) { height *= 2; } lua_pushnumber(L, height); @@ -661,8 +661,8 @@ int InputStateInfo_get_interlaced(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_interlaced[signal_num]); + int card_idx = theme->map_signal_to_card(luaL_checknumber(L, 2)); + lua_pushboolean(L, input_state_info->last_interlaced[card_idx]); return 1; } @@ -671,8 +671,8 @@ int InputStateInfo_get_has_signal(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_has_signal[signal_num]); + int card_idx = theme->map_signal_to_card(luaL_checknumber(L, 2)); + lua_pushboolean(L, input_state_info->last_has_signal[card_idx]); return 1; } @@ -681,8 +681,8 @@ 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]); + int card_idx = theme->map_signal_to_card(luaL_checknumber(L, 2)); + lua_pushboolean(L, input_state_info->last_is_connected[card_idx]); return 1; } @@ -691,8 +691,8 @@ int InputStateInfo_get_frame_rate_nom(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_pushnumber(L, input_state_info->last_frame_rate_nom[signal_num]); + int card_idx = theme->map_signal_to_card(luaL_checknumber(L, 2)); + lua_pushnumber(L, input_state_info->last_frame_rate_nom[card_idx]); return 1; } @@ -701,8 +701,8 @@ int InputStateInfo_get_frame_rate_den(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_pushnumber(L, input_state_info->last_frame_rate_den[signal_num]); + int card_idx = theme->map_signal_to_card(luaL_checknumber(L, 2)); + lua_pushnumber(L, input_state_info->last_frame_rate_den[card_idx]); return 1; } @@ -711,11 +711,11 @@ int InputStateInfo_get_last_subtitle(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)); - if (!input_state_info->has_last_subtitle[signal_num]) { + int card_idx = theme->map_signal_to_card(luaL_checknumber(L, 2)); + if (!input_state_info->has_last_subtitle[card_idx]) { lua_pushnil(L); } else { - lua_pushstring(L, input_state_info->last_subtitle[signal_num].c_str()); + lua_pushstring(L, input_state_info->last_subtitle[card_idx].c_str()); } return 1; } @@ -760,22 +760,22 @@ int InputStateInfo_get_human_readable_resolution(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)); + int card_idx = theme->map_signal_to_card(luaL_checknumber(L, 2)); string str; - if (!input_state_info->last_is_connected[signal_num]) { + if (!input_state_info->last_is_connected[card_idx]) { str = "disconnected"; - } else if (input_state_info->last_height[signal_num] <= 0) { + } else if (input_state_info->last_height[card_idx] <= 0) { str = "no signal"; - } else if (!input_state_info->last_has_signal[signal_num]) { - if (input_state_info->last_height[signal_num] == 525) { + } else if (!input_state_info->last_has_signal[card_idx]) { + if (input_state_info->last_height[card_idx] == 525) { // Special mode for the USB3 cards. str = "no signal"; } else { - str = get_human_readable_resolution(input_state_info, signal_num) + ", no signal"; + str = get_human_readable_resolution(input_state_info, card_idx) + ", no signal"; } } else { - str = get_human_readable_resolution(input_state_info, signal_num); + str = get_human_readable_resolution(input_state_info, card_idx); } lua_pushstring(L, str.c_str()); @@ -1123,14 +1123,14 @@ bool LiveInputWrapper::connect_signal(int signal_num) return true; } - signal_num = theme->map_signal(signal_num); - connect_signal_raw(signal_num, *theme->input_state); + int card_idx = theme->map_signal_to_card(signal_num); + connect_signal_raw(card_idx, *theme->input_state); return true; } -void LiveInputWrapper::connect_signal_raw(int signal_num, const InputState &input_state) +void LiveInputWrapper::connect_signal_raw(int card_idx, const InputState &input_state) { - BufferedFrame first_frame = input_state.buffered_frames[signal_num][0]; + BufferedFrame first_frame = input_state.buffered_frames[card_idx][0]; if (first_frame.frame == nullptr) { // No data yet. return; @@ -1145,10 +1145,10 @@ void LiveInputWrapper::connect_signal_raw(int signal_num, const InputState &inpu } } - movit::YCbCrLumaCoefficients ycbcr_coefficients = input_state.ycbcr_coefficients[signal_num]; - bool full_range = input_state.full_range[signal_num]; + movit::YCbCrLumaCoefficients ycbcr_coefficients = input_state.ycbcr_coefficients[card_idx]; + bool full_range = input_state.full_range[card_idx]; - if (input_state.ycbcr_coefficients_auto[signal_num]) { + if (input_state.ycbcr_coefficients_auto[card_idx]) { full_range = false; // The Blackmagic driver docs claim that the device outputs Y'CbCr @@ -1172,7 +1172,7 @@ void LiveInputWrapper::connect_signal_raw(int signal_num, const InputState &inpu BufferedFrame last_good_frame = first_frame; for (unsigned i = 0; i < max(ycbcr_inputs.size(), rgba_inputs.size()); ++i) { - BufferedFrame frame = input_state.buffered_frames[signal_num][i]; + BufferedFrame frame = input_state.buffered_frames[card_idx][i]; if (frame.frame == nullptr) { // Not enough data; reuse last frame (well, field). // This is suboptimal, but we have nothing better. @@ -1224,7 +1224,7 @@ void LiveInputWrapper::connect_signal_raw(int signal_num, const InputState &inpu } if (deinterlace) { - BufferedFrame frame = input_state.buffered_frames[signal_num][0]; + BufferedFrame frame = input_state.buffered_frames[card_idx][0]; CHECK(deinterlace_effect->set_int("current_field_position", frame.field_number)); } } @@ -1788,7 +1788,7 @@ string Theme::get_channel_name(unsigned channel) return retstr; } -int Theme::get_channel_signal(unsigned channel) +int Theme::map_channel_to_signal(unsigned channel) { lock_guard lock(m); lua_getglobal(L, "channel_signal"); @@ -1864,7 +1864,7 @@ bool Theme::get_supports_set_wb(unsigned channel) void Theme::set_wb(unsigned channel, float r, float g, float b) { - int signal = get_channel_signal(channel); + int signal = map_channel_to_signal(channel); lock_guard lock(m); if (signal != -1) { @@ -1937,7 +1937,7 @@ vector Theme::get_transition_names(float t) return ret; } -int Theme::map_signal(int signal_num) +int Theme::map_signal_to_card(int signal_num) { // Negative numbers map to raw signals. if (signal_num < 0) { @@ -1972,11 +1972,11 @@ int Theme::map_signal(int signal_num) return card_index; } -void Theme::set_signal_mapping(int signal_num, int card_num) +void Theme::set_signal_mapping(int signal_num, int card_idx) { lock_guard lock(map_m); - assert(card_num < int(num_cards)); - signal_to_card_mapping[signal_num] = card_num; + assert(card_idx < int(num_cards)); + signal_to_card_mapping[signal_num] = card_idx; } void Theme::transition_clicked(int transition_num, float t) diff --git a/nageru/theme.h b/nageru/theme.h index 8e45373..2be6689 100644 --- a/nageru/theme.h +++ b/nageru/theme.h @@ -99,10 +99,10 @@ public: Chain get_chain(unsigned num, float t, unsigned width, unsigned height, const InputState &input_state); int get_num_channels() const { return num_channels; } - int map_signal(int signal_num); - void set_signal_mapping(int signal_num, int card_num); + int map_signal_to_card(int signal_num); + void set_signal_mapping(int signal_num, int card_idx); std::string get_channel_name(unsigned channel); - int get_channel_signal(unsigned channel); + int map_channel_to_signal(unsigned channel); bool get_supports_set_wb(unsigned channel); void set_wb(unsigned channel, float r, float g, float b); void set_wb_for_signal(int signal, float r, float g, float b); -- 2.39.2