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

small adds

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 547ad8a491
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-09 (Sat, 09 Sep 2017)

Origin message was:
------------------
- small adds

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-09-09 15:33:46 +02:00
parent 2e5f07ec99
commit 3aabfdbc58
13 changed files with 116 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
data/icons/status/ca/Makefile.am
View File

@@ -30,6 +30,7 @@ install_DATA = \
nagra_green.png \
nagra_white.png \
nagra_yellow.png \
ncam_green.png \
nds_green.png \
nds_white.png \
nds_yellow.png \

BIN
data/icons/status/ca/ncam_green.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 489 B

2
data/locale/deutsch.locale
View File

@@ -252,6 +252,8 @@ camd_item_gbox_hint GBox - Softcam und Emulator
camd_item_gbox_name gbox
camd_item_mgcamd_hint MGCamd - Emulator
camd_item_mgcamd_name mgcamd
camd_item_ncam_hint NCam - Softcam und Emulator
camd_item_ncam_name ncam
camd_item_newcs_hint NewCS - Softcam
camd_item_newcs_name newcs
camd_item_oscam_hint OSCam - Softcam

2
data/locale/english.locale
View File

@@ -252,6 +252,8 @@ camd_item_gbox_hint GBox - Softcam and emulator
camd_item_gbox_name gbox
camd_item_mgcamd_hint MGCamd - Emulator
camd_item_mgcamd_name mgcamd
camd_item_ncam_hint NCam - Softcam and emulator
camd_item_ncam_name ncam
camd_item_newcs_hint NewCS - Softcam
camd_item_newcs_name newcs
camd_item_oscam_hint OSCam - Softcam

74
data/y-web/Y_NI_Camd-control.yhtm
View File

@@ -2,6 +2,7 @@
{=var-set:x_cs2gbox={=script:Y_NI_Tools is_exec cs2gbox=}=}
{=var-set:x_osemu={=script:Y_NI_Tools is_exec osemu=}=}
{=var-set:x_oscam={=script:Y_NI_Tools is_exec oscam=}=}
{=var-set:x_ncam={=script:Y_NI_Tools is_exec ncam=}=}
{=var-set:x_doscam={=script:Y_NI_Tools is_exec doscam=}=}
{=var-set:x_mgcamd={=script:Y_NI_Tools is_exec mgcamd=}=}
{=var-set:x_newcs={=script:Y_NI_Tools is_exec newcs=}=}
@@ -10,11 +11,13 @@
{=var-set:r_cs2gbox={=script:Y_NI_Tools is_running cs2gbox=}=}
{=var-set:r_osemu={=script:Y_NI_Tools is_running osemu=}=}
{=var-set:r_oscam={=script:Y_NI_Tools is_running oscam=}=}
{=var-set:r_ncam={=script:Y_NI_Tools is_running ncam=}=}
{=var-set:r_doscam={=script:Y_NI_Tools is_running doscam=}=}
{=var-set:r_mgcamd={=script:Y_NI_Tools is_running mgcamd=}=}
{=var-set:r_newcs={=script:Y_NI_Tools is_running newcs=}=}
{=var-set:oscamport={=script:Y_NI_Tools get_oscam_webif_port=}=}
{=var-set:ncamport={=script:Y_NI_Tools get_ncam_webif_port=}=}
{=var-set:doscamport={=script:Y_NI_Tools get_doscam_webif_port=}=}
{=include-block:Y_NI_Blocks.txt;head=}
@@ -312,6 +315,77 @@ input[type="button"], .tools select {
</td>
</tr>
<tr class="list">
{=var-set:camd=ncam=}
<td>
<img src="images/{=if-equal:{=var-get:r_{=var-get:camd=}=}~true~check_green~x_red=}.png" class="status">
{=if-equal:{=var-get:r_{=var-get:camd=}=}~true~
<u><a href="#" onclick='goPort("{=var-get:oscamport=}");'>{=var-get:camd=}</a></u>
~
{=var-get:camd=}
=}
</td>
<td>
<span class="vinfo">{=script:Y_NI_Tools vinfo {=var-get:camd=}=}</span>
</td>
{=if-equal:{=var-get:x_{=var-get:camd=}=}~true~
{=if-equal:{=var-get:r_{=var-get:camd=}=}~true~
<td>
<input type="button" value="{=L:ni.stop=}" title="{=L:ni.stop=} {=var-get:camd=}" onclick='Y_NI_Tools("{=var-get:camd=}stop", 10000);' />
</td>
<td>
<input type="button" value="{=L:ni.reset=}" title="{=L:ni.reset=} {=var-get:camd=}" onclick='Y_NI_Tools("{=var-get:camd=}reset", 10000);' />
</td>
~
<td>
<input type="button" value="{=L:ni.start=}" title="{=L:ni.start=} {=var-get:camd=}" onclick='Y_NI_Tools("{=var-get:camd=}start", 10000);' />
</td>
<td>
</td>
=}
~
<td>
</td>
<td>
</td>
=}
<td>
<span class="tools">
<select name="{=var-get:camd=}_tools" size="1" onchange="this.options[this.selectedIndex].onclick();">
<option onclick='return false;' selected>{=L:ni.camd-tools=} {=var-get:camd=}</option>
<option onclick='return false;'> {=L:ni.camd-tools.line=} </option>
<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/ncam.conf","edit", "width=800,height=600,resizable=yes");'>
{=L:ni.edit=}: ncam.conf
</option>
<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/ncam.dvbapi","edit", "width=800,height=600,resizable=yes");'>
{=L:ni.edit=}: ncam.dvbapi
</option>
<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/ncam.server","edit", "width=800,height=600,resizable=yes");'>
{=L:ni.edit=}: ncam.server
</option>
<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/ncam.services","edit", "width=800,height=600,resizable=yes");'>
{=L:ni.edit=}: ncam.services
</option>
<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/ncam.srvid","edit", "width=800,height=600,resizable=yes");'>
{=L:ni.edit=}: ncam.srvid
</option>
<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/ncam.user","edit", "width=800,height=600,resizable=yes");'>
{=L:ni.edit=}: ncam.user
</option>
{=if-equal:{=var-get:r_{=var-get:camd=}=}~true~
<option> {=L:ni.camd-tools.line=} </option>
<option onclick='Y_NI_Tools("ecminfo");'>
{=L:ni.camd-tools.ecminfo=}
</option>
<option onclick='Y_NI_Tools("ncamversion");'>
{=L:ni.camd-tools.ncamversion=}
</option>
~
=}
</select>
</span>
</td>
</tr>
<tr class="list">
{=var-set:camd=doscam=}
<td>
<img src="images/{=if-equal:{=var-get:r_{=var-get:camd=}=}~true~check_green~x_red=}.png" class="status">

1
data/y-web/languages/Deutsch
View File

@@ -659,6 +659,7 @@ ni.camd-tools.pidinfo=PID-Informationen
ni.camd-tools.mgshareinfo=NewCamd Verbindungen
ni.camd-tools.cs2gboxinfo=Allgemeine Informationen
ni.camd-tools.oscamversion=Allgemeine Informationen
ni.camd-tools.ncamversion=Allgemeine Informationen
ni.camd-tools.doscamversion=Allgemeine Informationen
ni.pzapit-control=PZapit

1
data/y-web/languages/English
View File

@@ -662,6 +662,7 @@ ni.camd-tools.pidinfo=PID-Informations
ni.camd-tools.mgshareinfo=NewCamd Lines
ni.camd-tools.cs2gboxinfo=Common Informations
ni.camd-tools.oscamversion=Common Informations
ni.camd-tools.ncamversion=Common Informations
ni.camd-tools.doscamversion=Common Informations
ni.pzapit-control=PZapit

14
data/y-web/scripts/Y_NI_Camd-control.sh
View File

@@ -88,6 +88,20 @@ case "$1" in
echo "[$BNAME] oscam-reset"
/etc/init.d/emu reset oscam >/dev/console
;;
ncam_start)
echo "[$BNAME] ncam-start"
touch /var/etc/.ncam
/etc/init.d/emu start ncam >/dev/console
;;
ncam_stop)
echo "[$BNAME] ncam-stop"
rm -rf /var/etc/.ncam
/etc/init.d/emu stop ncam >/dev/console
;;
ncam_reset)
echo "[$BNAME] ncam-reset"
/etc/init.d/emu reset ncam >/dev/console
;;
doscam_start)
echo "[$BNAME] doscam-start"
touch /var/etc/.doscam

12
data/y-web/scripts/Y_NI_Tools.sh
View File

@@ -258,6 +258,9 @@ case "$action" in
oscamstop) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh oscam_stop;;
oscamstart) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh oscam_start;;
oscamreset) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh oscam_reset;;
ncamstop) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh ncam_stop;;
ncamstart) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh ncam_start;;
ncamreset) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh ncam_reset;;
doscamstop) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh doscam_stop;;
doscamstart) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh doscam_start;;
doscamreset) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh doscam_reset;;
@@ -290,6 +293,7 @@ case "$action" in
ecminfo) file2msg /tmp/ecm.info "ecm-info";;
pidinfo) file2msg /tmp/pid.info "pid-info";;
oscamversion) file2msg /tmp/.oscam/oscam.version "oscam-info";;
ncamversion) file2msg /tmp/.ncam/ncam.version "ncam-info";;
doscamversion) file2msg /tmp/.doscam/doscam.version "doscam-info";;
get_oscam_webif_port)
@@ -300,6 +304,14 @@ case "$action" in
printf "%s" ${_port:-8080}
;;
get_ncam_webif_port)
if [ -e %(CONFIGDIR)/ncam.conf ]; then
_port=$(grep -m 1 -i "^[:space:]*httpport" %(CONFIGDIR)/ncam.conf | cut -d'=' -f2)
_port=$(echo $_port | dos2unix -u)
fi
printf "%s" ${_port:-8181}
;;
get_doscam_webif_port)
if [ -e %(CONFIGDIR)/doscam.cfg ]; then
_port=$(grep -m 1 -i "^[:space:]*httpport" %(CONFIGDIR)/doscam.cfg | cut -d'=' -f2)

4
src/gui/infoviewer_bb.cpp
View File

@@ -1030,8 +1030,8 @@ void CInfoViewerBB::paint_cam_icons()
std::ostringstream buf;
int emu_pic_startx = g_InfoViewer->ChanInfoX + (g_settings.infobar_casystem_frame ? 20 : 10);
int py = g_InfoViewer->BoxEndY + (g_settings.infobar_casystem_frame ? 4 : 2);
const char *icon_name[] = {"mgcamd","doscam","oscam","osemu","newcs","gbox"};
static int icon_space[] = {10,10,10,10,10,10};
const char *icon_name[] = {"mgcamd","doscam","ncam","oscam","osemu","newcs","gbox"};
static int icon_space[] = {10,10,10,10,10,10,10};
int icon_sizeH = 0;
int icon_sizeW = 0;
bool useCI = CCamManager::getInstance()->getUseCI();

3
src/gui/ni_menu.cpp
View File

@@ -65,6 +65,7 @@ emu_menu_data_t emu_menu[]=
{
{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_OSCAM_NAME, LOCALE_CAMD_ITEM_OSCAM_HINT, "OSCAM", "oscam", 0, 0},
{LOCALE_CAMD_ITEM_OSEMU_NAME, LOCALE_CAMD_ITEM_OSEMU_HINT, "OSEMU", "osemu", 0, 0},
{LOCALE_CAMD_ITEM_NEWCS_NAME, LOCALE_CAMD_ITEM_NEWCS_HINT, "NEWCS", "newcs", 0, 0},
@@ -239,6 +240,7 @@ bool CNITouchFileNotifier::changeNotify(const neutrino_locale_t, void * data)
strstr(filename, "newcs") ||
strstr(filename, "osemu") ||
strstr(filename, "doscam") ||
strstr(filename, "ncam") ||
strstr(filename, "oscam") ||
strstr(filename, "cs2gbox") ||
strstr(filename, "gbox"))
@@ -293,6 +295,7 @@ bool CNITouchFileNotifier::changeNotify(const neutrino_locale_t, void * data)
strstr(filename, "newcs") ||
strstr(filename, "osemu") ||
strstr(filename, "doscam") ||
strstr(filename, "ncam") ||
strstr(filename, "oscam") ||
strstr(filename, "cs2gbox") ||
strstr(filename, "gbox"))

2
src/system/locals.h
View File

@@ -279,6 +279,8 @@ typedef enum
LOCALE_CAMD_ITEM_GBOX_NAME,
LOCALE_CAMD_ITEM_MGCAMD_HINT,
LOCALE_CAMD_ITEM_MGCAMD_NAME,
LOCALE_CAMD_ITEM_NCAM_HINT,
LOCALE_CAMD_ITEM_NCAM_NAME,
LOCALE_CAMD_ITEM_NEWCS_HINT,
LOCALE_CAMD_ITEM_NEWCS_NAME,
LOCALE_CAMD_ITEM_OSCAM_HINT,

2
src/system/locals_intern.h
View File

@@ -279,6 +279,8 @@ const char * locale_real_names[] =
"camd_item_gbox_name",
"camd_item_mgcamd_hint",
"camd_item_mgcamd_name",
"camd_item_ncam_hint",
"camd_item_ncam_name",
"camd_item_newcs_hint",
"camd_item_newcs_name",
"camd_item_oscam_hint",