From f1241ccd6d4e3d4d9a03b87b1789e261b7496b61 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Fri, 3 Mar 2017 19:00:40 +0100 Subject: [PATCH] imageinfo_ni: cleanup info_items struct; ... remove obsolete videoDecoder calls Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/6039c66423bcaf71ea51a1bc5251ef805b8b3e7d Author: vanhofen Date: 2017-03-03 (Fri, 03 Mar 2017) Origin message was: ------------------ - imageinfo_ni: cleanup info_items struct; ... remove obsolete videoDecoder calls ------------------ This commit was generated by Migit --- src/gui/imageinfo_ni.cpp | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/gui/imageinfo_ni.cpp b/src/gui/imageinfo_ni.cpp index e68e0d65d..f45f6b19b 100644 --- a/src/gui/imageinfo_ni.cpp +++ b/src/gui/imageinfo_ni.cpp @@ -58,8 +58,6 @@ #include -extern cVideo * videoDecoder; - extern CRemoteControl * g_RemoteControl; /* neutrino.cpp */ #include @@ -84,13 +82,14 @@ CImageInfoNI::CImageInfoNI() static const neutrino_locale_t info_items[] = { LOCALE_IMAGEINFO_IMAGE, - LOCALE_IMAGEINFO_DATE, LOCALE_IMAGEINFO_VERSION, + /* Commit: */ + LOCALE_IMAGEINFO_KERNEL, + /* Lua-API: */ + /* yWeb: */ + LOCALE_IMAGEINFO_DATE, LOCALE_IMAGEINFO_CREATOR, - LOCALE_IMAGEINFO_HOMEPAGE, - LOCALE_IMAGEINFO_DOKUMENTATION, - LOCALE_IMAGEINFO_FORUM, - LOCALE_IMAGEINFO_LICENSE + LOCALE_IMAGEINFO_HOMEPAGE }; int info_items_count = sizeof(info_items)/sizeof(info_items[0]); @@ -139,7 +138,6 @@ void CImageInfoNI::Init(void) CImageInfoNI::~CImageInfoNI() { StopInfoThread(); - videoDecoder->Pig(-1, -1, -1, -1); } int CImageInfoNI::exec(CMenuTarget* parent, const std::string &) @@ -239,7 +237,6 @@ int CImageInfoNI::exec(CMenuTarget* parent, const std::string &) void CImageInfoNI::hide() { frameBuffer->paintBackground(); - videoDecoder->Pig(-1, -1, -1, -1); } void CImageInfoNI::paint_pig(int px, int py, int w, int h) @@ -313,7 +310,7 @@ void CImageInfoNI::paint() struct utsname uts_info; ypos += iheight; - paintLine(xpos, font_info, "Kernel:"); + paintLine(xpos, font_info, g_Locale->getText(LOCALE_IMAGEINFO_KERNEL)); paintLine(xpos+offset, font_info, uname(&uts_info) < 0 ? "n/a" : uts_info.release); #ifdef ENABLE_LUA