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

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

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6c4f2be6d5
Author: Knicko <knicko@glj.servebbs.com>
Date: 2019-06-25 (Tue, 25 Jun 2019)


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

------------------
This commit was generated by Migit
This commit is contained in:
Knicko
2019-06-25 23:29:56 +02:00
committed by vanhofen
parent 5193263ecc
commit d79123dc9f
13 changed files with 68 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
data/icons/status/camd/Makefile.am
View File

@@ -15,6 +15,7 @@ install_DATA = \
mgcamd_green.png \ mgcamd_green.png \
ncam_green.png \ ncam_green.png \
ncam_yellow.png \ ncam_yellow.png \
newcs_green.png \
oscam_green.png \ oscam_green.png \
oscam_yellow.png oscam_yellow.png \
osmod_green.png \
osmod_yellow.png

BIN
data/icons/status/camd/newcs_green.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 278 B

6
data/locale/deutsch.locale
View File

@@ -256,8 +256,6 @@ cablesetup.provider Kabelanbieter
camd_control camd-Steuerung camd_control camd-Steuerung
camd_item_cccam_hint CCcam - Softcam camd_item_cccam_hint CCcam - Softcam
camd_item_cccam_name cccam camd_item_cccam_name cccam
camd_item_cs2gbox_hint cs2gbox - Newcamd Bridge
camd_item_cs2gbox_name cs2gbox
camd_item_doscam_hint DOSCam - Softcam und Emulator camd_item_doscam_hint DOSCam - Softcam und Emulator
camd_item_doscam_name doscam camd_item_doscam_name doscam
camd_item_gbox_hint GBox - Softcam und Emulator camd_item_gbox_hint GBox - Softcam und Emulator
@@ -266,8 +264,8 @@ camd_item_mgcamd_hint MGCamd - Emulator
camd_item_mgcamd_name mgcamd camd_item_mgcamd_name mgcamd
camd_item_ncam_hint NCam - Softcam und Emulator camd_item_ncam_hint NCam - Softcam und Emulator
camd_item_ncam_name ncam camd_item_ncam_name ncam
camd_item_newcs_hint NewCS - Softcam camd_item_osmod_hint OSMod - Softcam und Emulator
camd_item_newcs_name newcs camd_item_osmod_name oscam-smod
camd_item_oscam_hint OSCam - Softcam camd_item_oscam_hint OSCam - Softcam
camd_item_oscam_name oscam camd_item_oscam_name oscam
camd_msg_reset camd wird neu gestartet camd_msg_reset camd wird neu gestartet

6
data/locale/english.locale
View File

@@ -256,8 +256,6 @@ cablesetup.provider cable provider
camd_control camd control camd_control camd control
camd_item_cccam_hint CCcam - Softcam camd_item_cccam_hint CCcam - Softcam
camd_item_cccam_name cccam camd_item_cccam_name cccam
camd_item_cs2gbox_hint cs2gbox - Newcamd bridge
camd_item_cs2gbox_name cs2gbox
camd_item_doscam_hint DOSCam - Softcam and emulator camd_item_doscam_hint DOSCam - Softcam and emulator
camd_item_doscam_name doscam camd_item_doscam_name doscam
camd_item_gbox_hint GBox - Softcam and emulator camd_item_gbox_hint GBox - Softcam and emulator
@@ -266,8 +264,8 @@ camd_item_mgcamd_hint MGCamd - Emulator
camd_item_mgcamd_name mgcamd camd_item_mgcamd_name mgcamd
camd_item_ncam_hint NCam - Softcam and emulator camd_item_ncam_hint NCam - Softcam and emulator
camd_item_ncam_name ncam camd_item_ncam_name ncam
camd_item_newcs_hint NewCS - Softcam camd_item_osmod_hint OSMod - Softcam und Emulator
camd_item_newcs_name newcs camd_item_osmod_name oscam-smod
camd_item_oscam_hint OSCam - Softcam camd_item_oscam_hint OSCam - Softcam
camd_item_oscam_name oscam camd_item_oscam_name oscam
camd_msg_reset camd will be restarted camd_msg_reset camd will be restarted

8
data/locale/slovak.locale
View File

@@ -250,18 +250,16 @@ cablesetup.provider Káblový poskytovateľ
camd_control CAMd nastavenia camd_control CAMd nastavenia
camd_item_cccam_hint CCCam - Softcam a emulátor camd_item_cccam_hint CCCam - Softcam a emulátor
camd_item_cccam_name cccam camd_item_cccam_name cccam
camd_item_cs2gbox_hint cs2gbox - Newcamd premostenie
camd_item_cs2gbox_name cs2gbox
camd_item_doscam_hint DOSCam - Softcam a emulátor camd_item_doscam_hint DOSCam - Softcam a emulátor
camd_item_doscam_name doscam camd_item_doscam_name doscam
camd_item_gbox_hint GBox - Softcam a emulátor camd_item_gbox_hint GBox - Softcam a emulátor
camd_item_gbox_name gbox camd_item_gbox_name gbox
camd_item_mgcamd_hint MGCamd - Emulátor camd_item_mgcamd_hint MGCamd - Emulátor
camd_item_mgcamd_name mgcamd camd_item_mgcamd_name mgcamd
camd_item_ncam_hint NCam - Softcam camd_item_ncam_hint NCam - Softcam a emulátor
camd_item_ncam_name ncam camd_item_ncam_name ncam
camd_item_newcs_hint NewCS - Softcam camd_item_osmod_hint OSMod - Softcam a emulátor
camd_item_newcs_name newcs camd_item_osmod_name osmod-smod
camd_item_oscam_hint OSCam - Softcam camd_item_oscam_hint OSCam - Softcam
camd_item_oscam_name oscam camd_item_oscam_name oscam
camd_msg_reset CAMd reštart v poriadku camd_msg_reset CAMd reštart v poriadku

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

@@ -1,18 +1,16 @@
{=var-set:x_gbox={=script:Y_NI_Tools is_exec gbox=}=} {=var-set:x_gbox={=script:Y_NI_Tools is_exec gbox=}=}
{=var-set:x_cs2gbox={=script:Y_NI_Tools is_exec cs2gbox=}=}
{=var-set:x_oscam={=script:Y_NI_Tools is_exec oscam=}=} {=var-set:x_oscam={=script:Y_NI_Tools is_exec oscam=}=}
{=var-set:x_osmod={=script:Y_NI_Tools is_exec osmod=}=}
{=var-set:x_ncam={=script:Y_NI_Tools is_exec ncam=}=} {=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_doscam={=script:Y_NI_Tools is_exec doscam=}=}
{=var-set:x_mgcamd={=script:Y_NI_Tools is_exec mgcamd=}=} {=var-set:x_mgcamd={=script:Y_NI_Tools is_exec mgcamd=}=}
{=var-set:x_newcs={=script:Y_NI_Tools is_exec newcs=}=}
{=var-set:r_gbox={=script:Y_NI_Tools is_running gbox=}=} {=var-set:r_gbox={=script:Y_NI_Tools is_running gbox=}=}
{=var-set:r_cs2gbox={=script:Y_NI_Tools is_running cs2gbox=}=}
{=var-set:r_oscam={=script:Y_NI_Tools is_running oscam=}=} {=var-set:r_oscam={=script:Y_NI_Tools is_running oscam=}=}
{=var-set:r_osmod={=script:Y_NI_Tools is_running osmod=}=}
{=var-set:r_ncam={=script:Y_NI_Tools is_running ncam=}=} {=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_doscam={=script:Y_NI_Tools is_running doscam=}=}
{=var-set:r_mgcamd={=script:Y_NI_Tools is_running mgcamd=}=} {=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:oscamport={=script:Y_NI_Tools get_oscam_webif_port=}=}
{=var-set:ncamport={=script:Y_NI_Tools get_ncam_webif_port=}=} {=var-set:ncamport={=script:Y_NI_Tools get_ncam_webif_port=}=}
@@ -144,10 +142,14 @@ input[type="button"], .tools select {
</td> </td>
</tr> </tr>
<tr class="list"> <tr class="list">
{=var-set:camd=cs2gbox=} {=var-set:camd=oscam=}
<td> <td>
<img src="images/{=if-equal:{=var-get:r_{=var-get:camd=}=}~true~check_green~x_red=}.png" class="status"> <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=} {=var-get:camd=}
=}
</td> </td>
<td> <td>
<span class="vinfo">{=script:Y_NI_Tools vinfo {=var-get:camd=}=}</span> <span class="vinfo">{=script:Y_NI_Tools vinfo {=var-get:camd=}=}</span>
@@ -178,13 +180,31 @@ input[type="button"], .tools select {
<select name="{=var-get:camd=}_tools" size="1" onchange="this.options[this.selectedIndex].onclick();"> <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;' selected>{=L:ni.camd-tools=} {=var-get:camd=}</option>
<option onclick='return false;'> {=L:ni.camd-tools.line=} </option> <option onclick='return false;'> {=L:ni.camd-tools.line=} </option>
<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=/var/keys/cs2gbox.cfg","edit", "width=800,height=600,resizable=yes");'> <option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/oscam.conf","edit", "width=800,height=600,resizable=yes");'>
{=L:ni.edit=}: cs2gbox.cfg {=L:ni.edit=}: oscam.conf
</option>
<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/oscam.dvbapi","edit", "width=800,height=600,resizable=yes");'>
{=L:ni.edit=}: oscam.dvbapi
</option>
<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/oscam.server","edit", "width=800,height=600,resizable=yes");'>
{=L:ni.edit=}: oscam.server
</option>
<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/oscam.services","edit", "width=800,height=600,resizable=yes");'>
{=L:ni.edit=}: oscam.services
</option>
<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/oscam.srvid","edit", "width=800,height=600,resizable=yes");'>
{=L:ni.edit=}: oscam.srvid
</option>
<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/oscam.user","edit", "width=800,height=600,resizable=yes");'>
{=L:ni.edit=}: oscam.user
</option> </option>
{=if-equal:{=var-get:r_{=var-get:camd=}=}~true~ {=if-equal:{=var-get:r_{=var-get:camd=}=}~true~
<option> {=L:ni.camd-tools.line=} </option> <option> {=L:ni.camd-tools.line=} </option>
<option onclick='Y_NI_Tools("cs2gboxinfo");'> <option onclick='Y_NI_Tools("ecminfo");'>
{=L:ni.camd-tools.cs2gboxinfo=} {=L:ni.camd-tools.ecminfo=}
</option>
<option onclick='Y_NI_Tools("oscamversion");'>
{=L:ni.camd-tools.oscamversion=}
</option> </option>
~ ~
=} =}
@@ -193,7 +213,7 @@ input[type="button"], .tools select {
</td> </td>
</tr> </tr>
<tr class="list"> <tr class="list">
{=var-set:camd=oscam=} {=var-set:camd=osmod=}
<td> <td>
<img src="images/{=if-equal:{=var-get:r_{=var-get:camd=}=}~true~check_green~x_red=}.png" class="status"> <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~ {=if-equal:{=var-get:r_{=var-get:camd=}=}~true~
@@ -502,54 +522,6 @@ input[type="button"], .tools select {
</span> </span>
</td> </td>
</tr> </tr>
<tr class="list">
{=var-set:camd=newcs=}
<td>
<img src="images/{=if-equal:{=var-get:r_{=var-get:camd=}=}~true~check_green~x_red=}.png" class="status">
{=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)/newcs.xml","edit", "width=800,height=600,resizable=yes");'>
{=L:ni.edit=}: newcs.xml
</option>
{=if-equal:{=var-get:r_{=var-get:camd=}=}~true~
<option> {=L:ni.camd-tools.line=} </option>
<option>
</option>
~
=}
</select>
</span>
</td>
</tr>
</table> </table>
</form> </form>
</div> </div>

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

@@ -46,20 +46,6 @@ case "$1" in
echo "[$BNAME] gbox-reset" echo "[$BNAME] gbox-reset"
/etc/init.d/camd reset gbox >/dev/console /etc/init.d/camd reset gbox >/dev/console
;; ;;
cs2gbox_start)
echo "[$BNAME] cs2gbox-start"
touch /var/etc/.cs2gbox
/etc/init.d/camd start cs2gbox >/dev/console
;;
cs2gbox_stop)
echo "[$BNAME] cs2gbox-stop"
rm -rf /var/etc/.cs2gbox
/etc/init.d/camd stop cs2gbox >/dev/console
;;
cs2gbox_reset)
echo "[$BNAME] cs2gbox-reset"
/etc/init.d/camd reset cs2gbox >/dev/console
;;
oscam_start) oscam_start)
echo "[$BNAME] oscam-start" echo "[$BNAME] oscam-start"
touch /var/etc/.oscam touch /var/etc/.oscam
@@ -74,6 +60,20 @@ case "$1" in
echo "[$BNAME] oscam-reset" echo "[$BNAME] oscam-reset"
/etc/init.d/camd reset oscam >/dev/console /etc/init.d/camd reset oscam >/dev/console
;; ;;
osmod_start)
echo "[$BNAME] osmod-start"
touch /var/etc/.osmod
/etc/init.d/camd start osmod >/dev/console
;;
osmod_stop)
echo "[$BNAME] osmod-stop"
rm -rf /var/etc/.osmod
/etc/init.d/camd stop osmod >/dev/console
;;
osmod_reset)
echo "[$BNAME] osmod-reset"
/etc/init.d/camd reset osmod >/dev/console
;;
ncam_start) ncam_start)
echo "[$BNAME] ncam-start" echo "[$BNAME] ncam-start"
touch /var/etc/.ncam touch /var/etc/.ncam
@@ -102,20 +102,6 @@ case "$1" in
echo "[$BNAME] doscam-reset" echo "[$BNAME] doscam-reset"
/etc/init.d/camd reset doscam >/dev/console /etc/init.d/camd reset doscam >/dev/console
;; ;;
newcs_start)
echo "[$BNAME] newcs-start"
touch /var/etc/.newcs
/etc/init.d/camd start newcs >/dev/console
;;
newcs_stop)
echo "[$BNAME] newcs-stop"
rm -rf /var/etc/.newcs
/etc/init.d/camd stop newcs >/dev/console
;;
newcs_reset)
echo "[$BNAME] newcs-reset"
/etc/init.d/camd reset newcs >/dev/console
;;
*) *)
echo "[$BNAME] Parameter wrong: $*" echo "[$BNAME] Parameter wrong: $*"
;; ;;

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

@@ -249,21 +249,18 @@ case "$action" in
gboxstop) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh gbox_stop;; gboxstop) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh gbox_stop;;
gboxstart) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh gbox_start;; gboxstart) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh gbox_start;;
gboxreset) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh gbox_reset;; gboxreset) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh gbox_reset;;
cs2gboxstop) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh cs2gbox_stop;;
cs2gboxstart) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh cs2gbox_start;;
cs2gboxreset) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh cs2gbox_reset;;
oscamstop) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh oscam_stop;; oscamstop) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh oscam_stop;;
oscamstart) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh oscam_start;; oscamstart) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh oscam_start;;
oscamreset) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh oscam_reset;; oscamreset) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh oscam_reset;;
osmodstop) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh osmod_stop;;
osmodstart) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh osmod_start;;
osmodreset) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh osmod_reset;;
ncamstop) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh ncam_stop;; ncamstop) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh ncam_stop;;
ncamstart) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh ncam_start;; ncamstart) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh ncam_start;;
ncamreset) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh ncam_reset;; ncamreset) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh ncam_reset;;
doscamstop) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh doscam_stop;; doscamstop) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh doscam_stop;;
doscamstart) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh doscam_start;; doscamstart) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh doscam_start;;
doscamreset) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh doscam_reset;; doscamreset) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh doscam_reset;;
newcsstop) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh newcs_stop;;
newcsstart) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh newcs_start;;
newcsreset) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh newcs_reset;;
vinfo) vinfo)
if ! [ -x $y_path_varbin/$1 ]; then if ! [ -x $y_path_varbin/$1 ]; then
@@ -282,7 +279,6 @@ case "$action" in
mgshareinfo) file2msg /tmp/mgshare.info "n-lines" maketable;; mgshareinfo) file2msg /tmp/mgshare.info "n-lines" maketable;;
mginfo) file2msg /tmp/mg.info "cs-info" maketable;; mginfo) file2msg /tmp/mg.info "cs-info" maketable;;
cccamdinfo) file2msg /tmp/cccamd.info "c-lines" maketable;; cccamdinfo) file2msg /tmp/cccamd.info "c-lines" maketable;;
cs2gboxinfo) file2msg /tmp/cs2gbox.info "cs2gbox-info";;
shareonl) file2msg /tmp/share.onl "online-share-info" maketable;; shareonl) file2msg /tmp/share.onl "online-share-info" maketable;;
shareinfo) file2msg /tmp/share.info "cs-info" maketable;; shareinfo) file2msg /tmp/share.info "cs-info" maketable;;
sc01info) file2msg /tmp/sc01.info "slot1-info";; sc01info) file2msg /tmp/sc01.info "slot1-info";;

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_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_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_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_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_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_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}
}; };
#define CAMDS_COUNT (sizeof(camds_data)/sizeof(struct camds_data_t)) #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; 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 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; 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; const int icon_space = OFFSET_INNER_SMALL;
int icon_sizeH = 0; int icon_sizeH = 0;
int icon_sizeW = 0; int icon_sizeW = 0;
@@ -1055,7 +1055,7 @@ void CInfoViewerBB::paint_cam_icons()
if ( getpidof(icon_name[i]) ) { if ( getpidof(icon_name[i]) ) {
buf.str(""); buf.str("");
buf << icon_name[i] << "_green"; 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) { if(camCI && useCI && filter_channels) {
buf.str(""); buf.str("");
buf << icon_name[i] << "_yellow"; buf << icon_name[i] << "_yellow";

6
src/system/locals.h
View File

@@ -283,8 +283,6 @@ typedef enum
LOCALE_CAMD_CONTROL, LOCALE_CAMD_CONTROL,
LOCALE_CAMD_ITEM_CCCAM_HINT, LOCALE_CAMD_ITEM_CCCAM_HINT,
LOCALE_CAMD_ITEM_CCCAM_NAME, LOCALE_CAMD_ITEM_CCCAM_NAME,
LOCALE_CAMD_ITEM_CS2GBOX_HINT,
LOCALE_CAMD_ITEM_CS2GBOX_NAME,
LOCALE_CAMD_ITEM_DOSCAM_HINT, LOCALE_CAMD_ITEM_DOSCAM_HINT,
LOCALE_CAMD_ITEM_DOSCAM_NAME, LOCALE_CAMD_ITEM_DOSCAM_NAME,
LOCALE_CAMD_ITEM_GBOX_HINT, LOCALE_CAMD_ITEM_GBOX_HINT,
@@ -293,10 +291,10 @@ typedef enum
LOCALE_CAMD_ITEM_MGCAMD_NAME, LOCALE_CAMD_ITEM_MGCAMD_NAME,
LOCALE_CAMD_ITEM_NCAM_HINT, LOCALE_CAMD_ITEM_NCAM_HINT,
LOCALE_CAMD_ITEM_NCAM_NAME, LOCALE_CAMD_ITEM_NCAM_NAME,
LOCALE_CAMD_ITEM_NEWCS_HINT,
LOCALE_CAMD_ITEM_NEWCS_NAME,
LOCALE_CAMD_ITEM_OSCAM_HINT, LOCALE_CAMD_ITEM_OSCAM_HINT,
LOCALE_CAMD_ITEM_OSCAM_NAME, LOCALE_CAMD_ITEM_OSCAM_NAME,
LOCALE_CAMD_ITEM_OSMOD_HINT,
LOCALE_CAMD_ITEM_OSMOD_NAME,
LOCALE_CAMD_MSG_RESET, LOCALE_CAMD_MSG_RESET,
LOCALE_CAMD_MSG_START, LOCALE_CAMD_MSG_START,
LOCALE_CAMD_MSG_STOP, LOCALE_CAMD_MSG_STOP,

6
src/system/locals_intern.h
View File

@@ -283,8 +283,6 @@ const char * locale_real_names[] =
"camd_control", "camd_control",
"camd_item_cccam_hint", "camd_item_cccam_hint",
"camd_item_cccam_name", "camd_item_cccam_name",
"camd_item_cs2gbox_hint",
"camd_item_cs2gbox_name",
"camd_item_doscam_hint", "camd_item_doscam_hint",
"camd_item_doscam_name", "camd_item_doscam_name",
"camd_item_gbox_hint", "camd_item_gbox_hint",
@@ -293,10 +291,10 @@ const char * locale_real_names[] =
"camd_item_mgcamd_name", "camd_item_mgcamd_name",
"camd_item_ncam_hint", "camd_item_ncam_hint",
"camd_item_ncam_name", "camd_item_ncam_name",
"camd_item_newcs_hint",
"camd_item_newcs_name",
"camd_item_oscam_hint", "camd_item_oscam_hint",
"camd_item_oscam_name", "camd_item_oscam_name",
"camd_item_osmod_hint",
"camd_item_osmod_name",
"camd_msg_reset", "camd_msg_reset",
"camd_msg_start", "camd_msg_start",
"camd_msg_stop", "camd_msg_stop",

6
src/system/setting_helpers.cpp
View File

@@ -174,12 +174,11 @@ bool CFlagFileNotifier::changeNotify(const neutrino_locale_t, void * data)
g_settings.font_scaling_y = 100; g_settings.font_scaling_y = 100;
} }
else if (strstr(filename, "mgcamd") || else if (strstr(filename, "mgcamd") ||
strstr(filename, "newcs") ||
strstr(filename, "doscam") || strstr(filename, "doscam") ||
strstr(filename, "ncam") || strstr(filename, "ncam") ||
strstr(filename, "osmod") ||
strstr(filename, "oscam") || strstr(filename, "oscam") ||
strstr(filename, "cccam") || strstr(filename, "cccam") ||
strstr(filename, "cs2gbox") ||
strstr(filename, "gbox")) strstr(filename, "gbox"))
{ {
CHintBox hintbox(LOCALE_CAMD_CONTROL, g_Locale->getText(LOCALE_CAMD_MSG_START)); CHintBox hintbox(LOCALE_CAMD_CONTROL, g_Locale->getText(LOCALE_CAMD_MSG_START));
@@ -222,12 +221,11 @@ bool CFlagFileNotifier::changeNotify(const neutrino_locale_t, void * data)
g_settings.font_scaling_y = 105; g_settings.font_scaling_y = 105;
} }
else if (strstr(filename, "mgcamd") || else if (strstr(filename, "mgcamd") ||
strstr(filename, "newcs") ||
strstr(filename, "doscam") || strstr(filename, "doscam") ||
strstr(filename, "ncam") || strstr(filename, "ncam") ||
strstr(filename, "osmod") ||
strstr(filename, "oscam") || strstr(filename, "oscam") ||
strstr(filename, "cccam") || strstr(filename, "cccam") ||
strstr(filename, "cs2gbox") ||
strstr(filename, "gbox")) strstr(filename, "gbox"))
{ {
CHintBox hintbox(LOCALE_CAMD_CONTROL, g_Locale->getText(LOCALE_CAMD_MSG_STOP)); CHintBox hintbox(LOCALE_CAMD_CONTROL, g_Locale->getText(LOCALE_CAMD_MSG_STOP));