drop osemu support

Origin commit data
------------------
Branch: ni/coolstream
Commit: ddad447597
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-05-19 (Sun, 19 May 2019)

Origin message was:
------------------
- drop osemu support

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

------------------
This commit was generated by Migit

data/icons/status/camd/Makefile.am

@@ -17,6 +17,4 @@ install_DATA = \
 	ncam_yellow.png \
 	newcs_green.png \
 	oscam_green.png \
-	oscam_yellow.png \
+	oscam_yellow.png
-	osemu_green.png \
-	osemu_yellow.png

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

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

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ý

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 {
 				</td>
 			</tr>
 			<tr class="list">
-			{=var-set:camd=osemu=}
-				<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=/var/bin/osemu.sh","edit", "width=800,height=600,resizable=yes");'>
-							{=L:ni.edit=}: osemu.sh
-						</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>
-						~
-						=}
-					</select>
-					</span>
-				</td>
-			</tr>
-			<tr class="list">
 			{=var-set:camd=oscam=}
 				<td>
 					<img src="images/{=if-equal:{=var-get:r_{=var-get:camd=}=}~true~check_green~x_red=}.png" class="status">

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

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;;

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},

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";

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,

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",

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")	||