From 8d3af4965b26d294ee21d4292eea7fa6bde03d29 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Mon, 26 Oct 2020 21:50:08 +0100 Subject: [PATCH] imageinfo: outsource hal info init into own member Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/9f4b65d0760964486e97a7aa936ba4482db4e0ba Author: Thilo Graf Date: 2020-10-26 (Mon, 26 Oct 2020) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/imageinfo.cpp | 18 ++++++++++++------ src/gui/imageinfo.h | 1 + 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/gui/imageinfo.cpp b/src/gui/imageinfo.cpp index ab4b5914d..5424a7940 100644 --- a/src/gui/imageinfo.cpp +++ b/src/gui/imageinfo.cpp @@ -377,6 +377,18 @@ void CImageInfo::InitInfoData() v_info.push_back({g_Locale->getText(LOCALE_IMAGEINFO_VCS), PACKAGE_VERSION_GIT}); #endif + //stb info + initHalInfo(); + + //internal api versions + initAPIVersions(); + + //support infos + initSupportInfo(); +} + +void CImageInfo::initHalInfo() +{ #if USE_STB_HAL hal_libversion_t ver; hal_get_lib_version(&ver); @@ -385,12 +397,6 @@ void CImageInfo::InitInfoData() //libstb-hal git status v_info.push_back({g_Locale->getText(LOCALE_IMAGEINFO_VCS), ver.vGitDescribe}); #endif - - //internal api versions - initAPIVersions(); - - //support infos - initSupportInfo(); } void CImageInfo::initSupportInfo() diff --git a/src/gui/imageinfo.h b/src/gui/imageinfo.h index 491db4082..e03191fce 100644 --- a/src/gui/imageinfo.h +++ b/src/gui/imageinfo.h @@ -58,6 +58,7 @@ class CImageInfo : public CMenuTarget void InitMinitv(); void InitInfos(); void InitBuildInfos(); + void initHalInfo(); void InitInfoText(const std::string& text); void initSupportInfo(); void initAPIVersions();