Skip to content

RDKEMW-17935 : remove ctrlm build flags - USE_DEPRECATED_HDMI_INPUT_P… #250

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dwolaver merged 2 commits into from
Jul 8, 2026
Merged

RDKEMW-17935 : remove ctrlm build flags - USE_DEPRECATED_HDMI_INPUT_P… #250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d83584
RDKEMW-17935 : remove ctrlm build flags - USE_DEPRECATED_HDMI_INPUT_P…
dwolaver Jun 24, 2026
dbc3e8c
Merge branch 'develop' into feature/RDKEMW-17935_remove_flag_USE_DEPR…
dwolaver Jun 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ option(XRSR_HTTP "Enable XRSR_HTTP" OFF)
option(XRSR_SDT "Enable XRSR_SDT" OFF)
option(ENABLE_ASYNC_SRVR_MSG "Enable Asynchronous Server Messaging Feature" OFF)
option(ENABLE_AVS_WITH_SDT "Enable SDT Based AVS Support" OFF)
option(USE_DEPRECATED_HDMI_INPUT_PLUGIN "Use deprecated HDMI Input plugin instead of AV Input plugin" OFF)

# BUILD SYSTEM
set(STAGING_BINDIR_NATIVE, "invalid" CACHE PATH "staging bin dir native")
Expand Down Expand Up @@ -253,10 +252,6 @@ else()
add_compile_definitions(SAFEC_DUMMY_API)
endif()

if(USE_DEPRECATED_HDMI_INPUT_PLUGIN)
add_compile_definitions(USE_DEPRECATED_HDMI_INPUT_PLUGIN)
endif()

install(TARGETS controlMgr RUNTIME DESTINATION bin)

install(FILES ${CMAKE_BINARY_DIR}/ctrlm_config.json DESTINATION ${CMAKE_INSTALL_SYSCONFDIR} COMPONENT config )
Expand Down
1 change: 0 additions & 1 deletion src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,6 @@ if(THUNDER)
thunder/plugins/ctrlm_thunder_plugin_display_settings.cpp
thunder/plugins/ctrlm_thunder_plugin_device_info.cpp
thunder/plugins/ctrlm_thunder_plugin_av_input.cpp
thunder/plugins/ctrlm_thunder_plugin_hdmi_input.cpp
thunder/plugins/ctrlm_thunder_plugin_system.cpp
ipc/ctrlm_rcp_ipc_iarm_thunder.cpp
voice/ipc/ctrlm_voice_ipc_iarm_thunder.cpp
Expand Down
12 changes: 0 additions & 12 deletions src/irdb/ctrlm_irdb_interface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,7 @@
#include "ctrlm_thunder_plugin_display_settings.h"
#include "ctrlm_thunder_plugin_cec_source.h"
// TV Platforms
#ifdef USE_DEPRECATED_HDMI_INPUT_PLUGIN
#include "ctrlm_thunder_plugin_hdmi_input.h"
#else
#include "ctrlm_thunder_plugin_av_input.h"
#endif
#include "ctrlm_thunder_plugin_cec_sink.h"
#endif

Expand Down Expand Up @@ -111,11 +107,7 @@ typedef struct {
Thunder::DisplaySettings::ctrlm_thunder_plugin_display_settings_t *display_settings;
Thunder::CEC::ctrlm_thunder_plugin_cec_source_t *cec_source;
Thunder::CECSink::ctrlm_thunder_plugin_cec_sink_t *cec_sink;
#ifdef USE_DEPRECATED_HDMI_INPUT_PLUGIN
Thunder::HDMIInput::ctrlm_thunder_plugin_hdmi_input_t *av_input;
#else
Thunder::AVInput::ctrlm_thunder_plugin_av_input_t *av_input;
#endif
#endif
} ctrlm_irdb_global_t;

Expand Down Expand Up @@ -383,11 +375,7 @@ void ctrlm_irdb_interface_t::on_thunder_ready() {
}
}
} else {
#ifdef USE_DEPRECATED_HDMI_INPUT_PLUGIN
g_irdb.av_input = Thunder::HDMIInput::ctrlm_thunder_plugin_hdmi_input_t::getInstance();
#else
g_irdb.av_input = Thunder::AVInput::ctrlm_thunder_plugin_av_input_t::getInstance();
#endif
g_irdb.cec_sink = Thunder::CECSink::ctrlm_thunder_plugin_cec_sink_t::getInstance();
}
#endif
Expand Down
242 changes: 0 additions & 242 deletions src/thunder/plugins/ctrlm_thunder_plugin_hdmi_input.cpp
View file
Open in desktop

This file was deleted.

Loading
Loading