diff --git a/data/icons/status/camd/Makefile.am b/data/icons/status/camd/Makefile.am index 4e83590a3..adc9dd1ae 100644 --- a/data/icons/status/camd/Makefile.am +++ b/data/icons/status/camd/Makefile.am @@ -17,6 +17,4 @@ install_DATA = \ ncam_yellow.png \ newcs_green.png \ oscam_green.png \ - oscam_yellow.png \ - osemu_green.png \ - osemu_yellow.png + oscam_yellow.png diff --git a/data/icons/status/camd/osemu_green.png b/data/icons/status/camd/osemu_green.png deleted file mode 100644 index 7f007190d..000000000 Binary files a/data/icons/status/camd/osemu_green.png and /dev/null differ diff --git a/data/icons/status/camd/osemu_yellow.png b/data/icons/status/camd/osemu_yellow.png deleted file mode 100644 index 323e9db4a..000000000 Binary files a/data/icons/status/camd/osemu_yellow.png and /dev/null differ diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index bb36327d8..d591c1a7b 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -270,8 +270,6 @@ camd_item_newcs_hint NewCS - Softcam camd_item_newcs_name newcs camd_item_oscam_hint OSCam - Softcam camd_item_oscam_name oscam -camd_item_osemu_hint OSEmu - Emulator -camd_item_osemu_name osemu camd_msg_reset camd wird neu gestartet camd_msg_start camd wird gestartet camd_msg_stop camd wird gestoppt diff --git a/data/locale/english.locale b/data/locale/english.locale index 08f18760a..be3ba8a40 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -270,8 +270,6 @@ camd_item_newcs_hint NewCS - Softcam camd_item_newcs_name newcs camd_item_oscam_hint OSCam - Softcam camd_item_oscam_name oscam -camd_item_osemu_hint OSEmu - Emulator -camd_item_osemu_name osemu camd_msg_reset camd will be restarted camd_msg_start camd will be started camd_msg_stop camd will be stopped diff --git a/data/locale/slovak.locale b/data/locale/slovak.locale index 05b3833c9..8a8bebd23 100644 --- a/data/locale/slovak.locale +++ b/data/locale/slovak.locale @@ -264,8 +264,6 @@ camd_item_newcs_hint NewCS - Softcam camd_item_newcs_name newcs camd_item_oscam_hint OSCam - Softcam camd_item_oscam_name oscam -camd_item_osemu_hint OSEmu - Emulátor -camd_item_osemu_name osemu camd_msg_reset CAMd reštart v poriadku camd_msg_start CAMd spustený camd_msg_stop CAMd zastavený diff --git a/data/y-web/Y_NI_Camd-control.yhtm b/data/y-web/Y_NI_Camd-control.yhtm index be85be64c..c4812c8be 100644 --- a/data/y-web/Y_NI_Camd-control.yhtm +++ b/data/y-web/Y_NI_Camd-control.yhtm @@ -1,6 +1,5 @@ {=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_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=}=} @@ -9,7 +8,6 @@ {=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_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=}=} @@ -195,55 +193,6 @@ input[type="button"], .tools select { - {=var-set:camd=osemu=} - - - {=var-get:camd=} - - - {=script:Y_NI_Tools vinfo {=var-get:camd=}=} - - {=if-equal:{=var-get:x_{=var-get:camd=}=}~true~ - {=if-equal:{=var-get:r_{=var-get:camd=}=}~true~ - - - - - - - ~ - - - - - - =} - ~ - - - - - =} - - - - - - - {=var-set:camd=oscam=} diff --git a/data/y-web/scripts/Y_NI_Camd-control.sh b/data/y-web/scripts/Y_NI_Camd-control.sh index 244d4c326..d84a81fde 100644 --- a/data/y-web/scripts/Y_NI_Camd-control.sh +++ b/data/y-web/scripts/Y_NI_Camd-control.sh @@ -60,20 +60,6 @@ case "$1" in echo "[$BNAME] cs2gbox-reset" /etc/init.d/camd reset cs2gbox >/dev/console ;; - osemu_start) - echo "[$BNAME] osemu-start" - touch /var/etc/.osemu - /etc/init.d/camd start osemu >/dev/console - ;; - osemu_stop) - echo "[$BNAME] osemu-stop" - rm -rf /var/etc/.osemu - /etc/init.d/camd stop osemu >/dev/console - ;; - osemu_reset) - echo "[$BNAME] osemu-reset" - /etc/init.d/camd reset osemu >/dev/console - ;; oscam_start) echo "[$BNAME] oscam-start" touch /var/etc/.oscam diff --git a/data/y-web/scripts/Y_NI_Tools.sh b/data/y-web/scripts/Y_NI_Tools.sh index fb0e30255..ddfe3ca46 100644 --- a/data/y-web/scripts/Y_NI_Tools.sh +++ b/data/y-web/scripts/Y_NI_Tools.sh @@ -252,9 +252,6 @@ case "$action" in 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;; - osemustop) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh osemu_stop;; - osemustart) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh osemu_start;; - osemureset) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Camd-control.sh osemu_reset;; 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;; diff --git a/src/gui/daemon_control.cpp b/src/gui/daemon_control.cpp index 801cd2f2b..8a29e7c74 100644 --- a/src/gui/daemon_control.cpp +++ b/src/gui/daemon_control.cpp @@ -146,7 +146,6 @@ camds_data_t camds_data[]= {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_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}, diff --git a/src/gui/infoviewer_bb.cpp b/src/gui/infoviewer_bb.cpp index a84b53241..e223791cb 100644 --- a/src/gui/infoviewer_bb.cpp +++ b/src/gui/infoviewer_bb.cpp @@ -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","osemu","cccam","newcs","gbox"}; + const char *icon_name[] = {"mgcamd","doscam","ncam","oscam","cccam","newcs","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") || strstr(icon_name[i], "osemu")) { + if(strstr(icon_name[i], "doscam") || strstr(icon_name[i], "ncam") || strstr(icon_name[i], "oscam")) { if(camCI && useCI && filter_channels) { buf.str(""); buf << icon_name[i] << "_yellow"; diff --git a/src/system/locals.h b/src/system/locals.h index 3cd3885fe..489d36922 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -297,8 +297,6 @@ typedef enum LOCALE_CAMD_ITEM_NEWCS_NAME, LOCALE_CAMD_ITEM_OSCAM_HINT, LOCALE_CAMD_ITEM_OSCAM_NAME, - LOCALE_CAMD_ITEM_OSEMU_HINT, - LOCALE_CAMD_ITEM_OSEMU_NAME, LOCALE_CAMD_MSG_RESET, LOCALE_CAMD_MSG_START, LOCALE_CAMD_MSG_STOP, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 8aa2d0e83..291458fe4 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -297,8 +297,6 @@ const char * locale_real_names[] = "camd_item_newcs_name", "camd_item_oscam_hint", "camd_item_oscam_name", - "camd_item_osemu_hint", - "camd_item_osemu_name", "camd_msg_reset", "camd_msg_start", "camd_msg_stop", diff --git a/src/system/setting_helpers.cpp b/src/system/setting_helpers.cpp index 028a7ce75..be1a5ba59 100644 --- a/src/system/setting_helpers.cpp +++ b/src/system/setting_helpers.cpp @@ -175,7 +175,6 @@ bool CFlagFileNotifier::changeNotify(const neutrino_locale_t, void * data) } else if (strstr(filename, "mgcamd") || strstr(filename, "newcs") || - strstr(filename, "osemu") || strstr(filename, "doscam") || strstr(filename, "ncam") || strstr(filename, "oscam") || @@ -224,7 +223,6 @@ bool CFlagFileNotifier::changeNotify(const neutrino_locale_t, void * data) } else if (strstr(filename, "mgcamd") || strstr(filename, "newcs") || - strstr(filename, "osemu") || strstr(filename, "doscam") || strstr(filename, "ncam") || strstr(filename, "oscam") ||