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

add osmod (oscam-smod); drop cs2gbox and newcs

Browse Source 
Origin commit data
------------------
Commit: 6c4f2be6d5
Author: Knicko007 <knicko@glj.servebbs.com>
Date: 2019-06-25 (Tue, 25 Jun 2019)
This commit is contained in:
Knicko007
2019-06-25 23:29:56 +02:00
committed by vanhofen
parent 6bd798697e
commit b8dd8d8da0
13 changed files with 68 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/daemon_control.cpp
View File

@@ -145,11 +145,10 @@ camds_data_t camds_data[]=
{LOCALE_CAMD_ITEM_MGCAMD_NAME, LOCALE_CAMD_ITEM_MGCAMD_HINT, "MGCAMD", "mgcamd", 0, 0},
{LOCALE_CAMD_ITEM_DOSCAM_NAME, LOCALE_CAMD_ITEM_DOSCAM_HINT, "DOSCAM", "doscam", 0, 0},
{LOCALE_CAMD_ITEM_NCAM_NAME, LOCALE_CAMD_ITEM_NCAM_HINT, "NCAM", "ncam", 0, 0},
{LOCALE_CAMD_ITEM_OSMOD_NAME, LOCALE_CAMD_ITEM_OSMOD_HINT, "OSMOD", "osmod", 0, 0},
{LOCALE_CAMD_ITEM_OSCAM_NAME, LOCALE_CAMD_ITEM_OSCAM_HINT, "OSCAM", "oscam", 0, 0},
{LOCALE_CAMD_ITEM_CCCAM_NAME, LOCALE_CAMD_ITEM_CCCAM_HINT, "CCCAM", "cccam", 0, 0},
{LOCALE_CAMD_ITEM_NEWCS_NAME, LOCALE_CAMD_ITEM_NEWCS_HINT, "NEWCS", "newcs", 0, 0},
{LOCALE_CAMD_ITEM_GBOX_NAME, LOCALE_CAMD_ITEM_GBOX_HINT, "GBOX.NET", "gbox", 0, 0},
{LOCALE_CAMD_ITEM_CS2GBOX_NAME, LOCALE_CAMD_ITEM_CS2GBOX_HINT, "CS2GBOX", "cs2gbox", 0, 0}
{LOCALE_CAMD_ITEM_GBOX_NAME, LOCALE_CAMD_ITEM_GBOX_HINT, "GBOX.NET", "gbox", 0, 0}
};
#define CAMDS_COUNT (sizeof(camds_data)/sizeof(struct camds_data_t))

4
src/gui/infoviewer_bb.cpp
View File

@@ -1044,7 +1044,7 @@ void CInfoViewerBB::paint_cam_icons()
std::ostringstream buf;
int emu_pic_startx = g_InfoViewer->ChanInfoX + OFFSET_INNER_MID + (g_settings.infobar_casystem_frame ? FRAME_WIDTH_MIN + OFFSET_INNER_SMALL : 0);
int py = g_InfoViewer->BoxEndY + OFFSET_INNER_SMALL;
const char *icon_name[] = {"mgcamd","doscam","ncam","oscam","cccam","newcs","gbox"};
const char *icon_name[] = {"mgcamd","doscam","ncam","osmod","oscam","cccam","gbox"};
const int icon_space = OFFSET_INNER_SMALL;
int icon_sizeH = 0;
int icon_sizeW = 0;
@@ -1055,7 +1055,7 @@ void CInfoViewerBB::paint_cam_icons()
if ( getpidof(icon_name[i]) ) {
buf.str("");
buf << icon_name[i] << "_green";
if(strstr(icon_name[i], "doscam") || strstr(icon_name[i], "ncam") || strstr(icon_name[i], "oscam")) {
if(strstr(icon_name[i], "doscam") || strstr(icon_name[i], "ncam") || strstr(icon_name[i], "osmod") || strstr(icon_name[i], "oscam")) {
if(camCI && useCI && filter_channels) {
buf.str("");
buf << icon_name[i] << "_yellow";