mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 01:11:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

imageinfo_ni: cleanup info_items struct; ...

Browse Source 
remove obsolete videoDecoder calls


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6039c66423
Author: vanhofen <vanhofen@gmx.de>
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
This commit is contained in:
vanhofen
2017-03-03 19:00:40 +01:00
parent 1aa6a499bf
commit f1241ccd6d
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/gui/imageinfo_ni.cpp
View File

@@ -58,8 +58,6 @@
#include <linux/version.h>
extern cVideo * videoDecoder;
extern CRemoteControl * g_RemoteControl; /* neutrino.cpp */
#include <gui/pictureviewer.h>
@@ -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