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

some minor renamings

Browse Source 
Origin commit data
------------------
Commit: f3ded5d509
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-09 (Thu, 09 Nov 2017)

Origin message was:
------------------
- some minor renamings
This commit is contained in:
vanhofen
2017-11-09 20:56:57 +01:00
parent 86968dc8ec
commit 3b28af7129
7 changed files with 44 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/locale/deutsch.locale
View File

@@ -247,6 +247,8 @@ ca_init_1 CI-Modul
ca_init_2 Conax-Karte und CI-Modul ca_init_2 Conax-Karte und CI-Modul
cablesetup.provider Kabelanbieter cablesetup.provider Kabelanbieter
camd_control camd-Steuerung camd_control camd-Steuerung
camd_item_ciplushelper_hint CI+ Helfer
camd_item_ciplushelper_name ciplushelper
camd_item_cs2gbox_hint cs2gbox - Newcamd Bridge camd_item_cs2gbox_hint cs2gbox - Newcamd Bridge
camd_item_cs2gbox_name cs2gbox camd_item_cs2gbox_name cs2gbox
camd_item_doscam_hint DOSCam - Softcam und Emulator camd_item_doscam_hint DOSCam - Softcam und Emulator

2
data/locale/english.locale
View File

@@ -247,6 +247,8 @@ ca_init_1 CI module
ca_init_2 Conax-Card and CI module ca_init_2 Conax-Card and CI module
cablesetup.provider cable provider cablesetup.provider cable provider
camd_control camd control camd_control camd control
camd_item_ciplushelper_hint CI+ helper
camd_item_ciplushelper_name ciplushelper
camd_item_cs2gbox_hint cs2gbox - Newcamd bridge camd_item_cs2gbox_hint cs2gbox - Newcamd bridge
camd_item_cs2gbox_name cs2gbox camd_item_cs2gbox_name cs2gbox
camd_item_doscam_hint DOSCam - Softcam and emulator camd_item_doscam_hint DOSCam - Softcam and emulator

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

@@ -8,127 +8,127 @@ BNAME=${0##*/}
case "$1" in case "$1" in
start) start)
echo "[$BNAME] softcamd-start" echo "[$BNAME] softcamd-start"
/etc/init.d/emu reset >/dev/console /etc/init.d/camd reset >/dev/console
;; ;;
stop) stop)
echo "[$BNAME] softcamd-stop" echo "[$BNAME] softcamd-stop"
/etc/init.d/emu stop >/dev/console /etc/init.d/camd stop >/dev/console
;; ;;
reset) reset)
echo "[$BNAME] softcamd-reset" echo "[$BNAME] softcamd-reset"
/etc/init.d/emu reset >/dev/console /etc/init.d/camd reset >/dev/console
;; ;;
mgcamd_start) mgcamd_start)
echo "[$BNAME] mgcamd-start" echo "[$BNAME] mgcamd-start"
touch /var/etc/.mgcamd touch /var/etc/.mgcamd
/etc/init.d/emu start mgcamd >/dev/console /etc/init.d/camd start mgcamd >/dev/console
;; ;;
mgcamd_stop) mgcamd_stop)
echo "[$BNAME] mgcamd-stop" echo "[$BNAME] mgcamd-stop"
/etc/init.d/emu stop mgcamd >/dev/console /etc/init.d/camd stop mgcamd >/dev/console
rm -rf /var/etc/.mgcamd rm -rf /var/etc/.mgcamd
;; ;;
mgcamd_reset) mgcamd_reset)
echo "[$BNAME] mgcamd-reset" echo "[$BNAME] mgcamd-reset"
/etc/init.d/emu reset mgcamd >/dev/console /etc/init.d/camd reset mgcamd >/dev/console
;; ;;
gbox_start) gbox_start)
echo "[$BNAME] gbox-start" echo "[$BNAME] gbox-start"
touch /var/etc/.gbox touch /var/etc/.gbox
/etc/init.d/emu start gbox >/dev/console /etc/init.d/camd start gbox >/dev/console
;; ;;
gbox_stop) gbox_stop)
echo "[$BNAME] gbox-stop" echo "[$BNAME] gbox-stop"
rm -rf /var/etc/.gbox rm -rf /var/etc/.gbox
/etc/init.d/emu stop gbox >/dev/console /etc/init.d/camd stop gbox >/dev/console
;; ;;
gbox_reset) gbox_reset)
echo "[$BNAME] gbox-reset" echo "[$BNAME] gbox-reset"
/etc/init.d/emu reset gbox >/dev/console /etc/init.d/camd reset gbox >/dev/console
;; ;;
cs2gbox_start) cs2gbox_start)
echo "[$BNAME] cs2gbox-start" echo "[$BNAME] cs2gbox-start"
touch /var/etc/.cs2gbox touch /var/etc/.cs2gbox
/etc/init.d/emu start cs2gbox >/dev/console /etc/init.d/camd start cs2gbox >/dev/console
;; ;;
cs2gbox_stop) cs2gbox_stop)
echo "[$BNAME] cs2gbox-stop" echo "[$BNAME] cs2gbox-stop"
rm -rf /var/etc/.cs2gbox rm -rf /var/etc/.cs2gbox
/etc/init.d/emu stop cs2gbox >/dev/console /etc/init.d/camd stop cs2gbox >/dev/console
;; ;;
cs2gbox_reset) cs2gbox_reset)
echo "[$BNAME] cs2gbox-reset" echo "[$BNAME] cs2gbox-reset"
/etc/init.d/emu reset cs2gbox >/dev/console /etc/init.d/camd reset cs2gbox >/dev/console
;; ;;
osemu_start) osemu_start)
echo "[$BNAME] osemu-start" echo "[$BNAME] osemu-start"
touch /var/etc/.osemu touch /var/etc/.osemu
/etc/init.d/emu start osemu >/dev/console /etc/init.d/camd start osemu >/dev/console
;; ;;
osemu_stop) osemu_stop)
echo "[$BNAME] osemu-stop" echo "[$BNAME] osemu-stop"
rm -rf /var/etc/.osemu rm -rf /var/etc/.osemu
/etc/init.d/emu stop osemu >/dev/console /etc/init.d/camd stop osemu >/dev/console
;; ;;
osemu_reset) osemu_reset)
echo "[$BNAME] osemu-reset" echo "[$BNAME] osemu-reset"
/etc/init.d/emu reset osemu >/dev/console /etc/init.d/camd reset osemu >/dev/console
;; ;;
oscam_start) oscam_start)
echo "[$BNAME] oscam-start" echo "[$BNAME] oscam-start"
touch /var/etc/.oscam touch /var/etc/.oscam
/etc/init.d/emu start oscam >/dev/console /etc/init.d/camd start oscam >/dev/console
;; ;;
oscam_stop) oscam_stop)
echo "[$BNAME] oscam-stop" echo "[$BNAME] oscam-stop"
rm -rf /var/etc/.oscam rm -rf /var/etc/.oscam
/etc/init.d/emu stop oscam >/dev/console /etc/init.d/camd stop oscam >/dev/console
;; ;;
oscam_reset) oscam_reset)
echo "[$BNAME] oscam-reset" echo "[$BNAME] oscam-reset"
/etc/init.d/emu reset oscam >/dev/console /etc/init.d/camd reset oscam >/dev/console
;; ;;
ncam_start) ncam_start)
echo "[$BNAME] ncam-start" echo "[$BNAME] ncam-start"
touch /var/etc/.ncam touch /var/etc/.ncam
/etc/init.d/emu start ncam >/dev/console /etc/init.d/camd start ncam >/dev/console
;; ;;
ncam_stop) ncam_stop)
echo "[$BNAME] ncam-stop" echo "[$BNAME] ncam-stop"
rm -rf /var/etc/.ncam rm -rf /var/etc/.ncam
/etc/init.d/emu stop ncam >/dev/console /etc/init.d/camd stop ncam >/dev/console
;; ;;
ncam_reset) ncam_reset)
echo "[$BNAME] ncam-reset" echo "[$BNAME] ncam-reset"
/etc/init.d/emu reset ncam >/dev/console /etc/init.d/camd reset ncam >/dev/console
;; ;;
doscam_start) doscam_start)
echo "[$BNAME] doscam-start" echo "[$BNAME] doscam-start"
touch /var/etc/.doscam touch /var/etc/.doscam
/etc/init.d/emu start doscam >/dev/console /etc/init.d/camd start doscam >/dev/console
;; ;;
doscam_stop) doscam_stop)
echo "[$BNAME] doscam-stop" echo "[$BNAME] doscam-stop"
rm -rf /var/etc/.doscam rm -rf /var/etc/.doscam
/etc/init.d/emu stop doscam >/dev/console /etc/init.d/camd stop doscam >/dev/console
;; ;;
doscam_reset) doscam_reset)
echo "[$BNAME] doscam-reset" echo "[$BNAME] doscam-reset"
/etc/init.d/emu reset doscam >/dev/console /etc/init.d/camd reset doscam >/dev/console
;; ;;
newcs_start) newcs_start)
echo "[$BNAME] newcs-start" echo "[$BNAME] newcs-start"
touch /var/etc/.newcs touch /var/etc/.newcs
/etc/init.d/emu start newcs >/dev/console /etc/init.d/camd start newcs >/dev/console
;; ;;
newcs_stop) newcs_stop)
echo "[$BNAME] newcs-stop" echo "[$BNAME] newcs-stop"
rm -rf /var/etc/.newcs rm -rf /var/etc/.newcs
/etc/init.d/emu stop newcs >/dev/console /etc/init.d/camd stop newcs >/dev/console
;; ;;
newcs_reset) newcs_reset)
echo "[$BNAME] newcs-reset" echo "[$BNAME] newcs-reset"
/etc/init.d/emu reset newcs >/dev/console /etc/init.d/camd reset newcs >/dev/console
;; ;;
*) *)
echo "[$BNAME] Parameter wrong: $*" echo "[$BNAME] Parameter wrong: $*"

3
src/gui/daemon_control.cpp
View File

@@ -152,6 +152,9 @@ camds_data_t camds_data[]=
{LOCALE_CAMD_ITEM_NEWCS_NAME, LOCALE_CAMD_ITEM_NEWCS_HINT, "NEWCS", "newcs", 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} {LOCALE_CAMD_ITEM_CS2GBOX_NAME, LOCALE_CAMD_ITEM_CS2GBOX_HINT, "CS2GBOX", "cs2gbox", 0, 0}
#if HAVE_ARM_HARDWARE
,{LOCALE_CAMD_ITEM_CIPLUSHELPER_NAME, LOCALE_CAMD_ITEM_CIPLUSHELPER_HINT, "CIPLUSHELPER", "ciplushelper", 0, 0}
#endif
}; };
#define CAMDS_COUNT (sizeof(camds_data)/sizeof(struct camds_data_t)) #define CAMDS_COUNT (sizeof(camds_data)/sizeof(struct camds_data_t))

2
src/system/locals.h
View File

@@ -274,6 +274,8 @@ typedef enum
LOCALE_CA_INIT_2, LOCALE_CA_INIT_2,
LOCALE_CABLESETUP_PROVIDER, LOCALE_CABLESETUP_PROVIDER,
LOCALE_CAMD_CONTROL, LOCALE_CAMD_CONTROL,
LOCALE_CAMD_ITEM_CIPLUSHELPER_HINT,
LOCALE_CAMD_ITEM_CIPLUSHELPER_NAME,
LOCALE_CAMD_ITEM_CS2GBOX_HINT, LOCALE_CAMD_ITEM_CS2GBOX_HINT,
LOCALE_CAMD_ITEM_CS2GBOX_NAME, LOCALE_CAMD_ITEM_CS2GBOX_NAME,
LOCALE_CAMD_ITEM_DOSCAM_HINT, LOCALE_CAMD_ITEM_DOSCAM_HINT,

2
src/system/locals_intern.h
View File

@@ -274,6 +274,8 @@ const char * locale_real_names[] =
"ca_init_2", "ca_init_2",
"cablesetup.provider", "cablesetup.provider",
"camd_control", "camd_control",
"camd_item_ciplushelper_hint",
"camd_item_ciplushelper_name",
"camd_item_cs2gbox_hint", "camd_item_cs2gbox_hint",
"camd_item_cs2gbox_name", "camd_item_cs2gbox_name",
"camd_item_doscam_hint", "camd_item_doscam_hint",

10
src/system/setting_helpers.cpp
View File

@@ -184,13 +184,14 @@ bool CFlagFileNotifier::changeNotify(const neutrino_locale_t, void * data)
strstr(filename, "ncam") || strstr(filename, "ncam") ||
strstr(filename, "oscam") || strstr(filename, "oscam") ||
strstr(filename, "cs2gbox") || strstr(filename, "cs2gbox") ||
strstr(filename, "ciplushelper")||
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));
hintbox.paint(); hintbox.paint();
printf("[CFlagFileNotifier] executing \"service emu start %s\"\n", filename); printf("[CFlagFileNotifier] executing \"service camd start %s\"\n", filename);
if (my_system(4, "service", "emu", "start", filename) != 0) if (my_system(4, "service", "camd", "start", filename) != 0)
printf("[CFlagFileNotifier] executing failed\n"); printf("[CFlagFileNotifier] executing failed\n");
sleep(1); sleep(1);
@@ -232,13 +233,14 @@ bool CFlagFileNotifier::changeNotify(const neutrino_locale_t, void * data)
strstr(filename, "ncam") || strstr(filename, "ncam") ||
strstr(filename, "oscam") || strstr(filename, "oscam") ||
strstr(filename, "cs2gbox") || strstr(filename, "cs2gbox") ||
strstr(filename, "ciplushelper")||
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));
hintbox.paint(); hintbox.paint();
printf("[CFlagFileNotifier] executing \"service emu stop %s\"\n", filename); printf("[CFlagFileNotifier] executing \"service camd stop %s\"\n", filename);
if (my_system(4, "service", "emu", "stop", filename) != 0) if (my_system(4, "service", "camd", "stop", filename) != 0)
printf("[CFlagFileNotifier] executing failed\n"); printf("[CFlagFileNotifier] executing failed\n");
sleep(1); sleep(1);