From 706027d7923e9388ffa785c24e466ab5ff4ab6c2 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Wed, 2 Jan 2019 18:59:05 +0100 Subject: [PATCH] imageinfo.cpp: adopt to last libstb changes --- src/gui/imageinfo.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/gui/imageinfo.cpp b/src/gui/imageinfo.cpp index 81e09a899..36ad19ba2 100644 --- a/src/gui/imageinfo.cpp +++ b/src/gui/imageinfo.cpp @@ -25,8 +25,8 @@ #include #endif -#if HAVE_CONFIG_HAL_H - #include +#if USE_STB_HAL +#include #endif #include @@ -357,11 +357,13 @@ void CImageInfo::InitInfoData() v_info.push_back({g_Locale->getText(LOCALE_IMAGEINFO_VCS), VCS}); #endif -#if HAVE_CONFIG_HAL_H +#if USE_STB_HAL + hal_libversion_t ver; + hal_get_lib_version(&ver); //libstb-hal version - v_info.push_back({"libstb_hal:", getPackageString()}); + v_info.push_back({"libstb-hal:", ver.vVersion}); //libstb-hal git status - v_info.push_back({g_Locale->getText(LOCALE_IMAGEINFO_VCS), getPackageVersionGit()}); + v_info.push_back({g_Locale->getText(LOCALE_IMAGEINFO_VCS), ver.vGitDescribe}); #endif //internal api versions