From 0c63297f0bb7f05e1a40d43a07bdff9cb96fce4b Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Fri, 5 Dec 2014 22:41:48 +0100
Subject: [PATCH] - yWeb: cleanup from unused esound stuff

---
 src/nhttpd/web/Y_Blocks.txt                |  1 -
 src/nhttpd/web/Y_Settings_Menue.yhtm       |  5 ---
 src/nhttpd/web/Y_Settings_personalize.yhtm |  8 ----
 src/nhttpd/web/Y_Version.txt               |  2 +-
 src/nhttpd/web/Y_neutrino_Blocks.txt       | 43 ----------------------
 src/nhttpd/web/languages/Czech             |  1 -
 src/nhttpd/web/languages/Deutsch           |  1 -
 src/nhttpd/web/languages/English           |  1 -
 src/nhttpd/web/languages/Portuguese        |  1 -
 src/nhttpd/web/languages/Slovak            |  1 -
 10 files changed, 1 insertion(+), 63 deletions(-)

diff --git a/src/nhttpd/web/Y_Blocks.txt b/src/nhttpd/web/Y_Blocks.txt
index 5f216f7ab..12c71185c 100644
--- a/src/nhttpd/web/Y_Blocks.txt
+++ b/src/nhttpd/web/Y_Blocks.txt
@@ -122,7 +122,6 @@ start-block~personalize_save_settings
 {=ini-set:/var/tuxbox/config/neutrino.conf;personalize_games;{=p_games=}~cache=}
 {=ini-set:/var/tuxbox/config/neutrino.conf;personalize_audioplayer;{=p_audioplayer=}~cache=}
 {=ini-set:/var/tuxbox/config/neutrino.conf;personalize_inetradio;{=p_inetradio=}~cache=}
-{=ini-set:/var/tuxbox/config/neutrino.conf;personalize_esound;{=p_esound=}~cache=}
 {=ini-set:/var/tuxbox/config/neutrino.conf;personalize_movieplayer;{=p_movieplayer=}~cache=}
 {=ini-set:/var/tuxbox/config/neutrino.conf;personalize_pictureviewer;{=p_picviewer=}~cache=}
 {=ini-set:/var/tuxbox/config/neutrino.conf;personalize_pincode;{=p_pincode=}~cache=}
diff --git a/src/nhttpd/web/Y_Settings_Menue.yhtm b/src/nhttpd/web/Y_Settings_Menue.yhtm
index d009c55b9..fc4148215 100644
--- a/src/nhttpd/web/Y_Settings_Menue.yhtm
+++ b/src/nhttpd/web/Y_Settings_Menue.yhtm
@@ -91,11 +91,6 @@ function init(){
 					{=var-set:m_link_text={=L:set.menue.video_audio=}=}
 					{=include-block:Y_Blocks.txt;management_link=}
 				</li>
-				<li>
-					{=var-set:m_link_href=Y_Settings_neutrino_forms.yhtm?form=neutrino_form-data_esound=}
-					{=var-set:m_link_text={=L:set.menue.esound_server=}=}
-					{=include-block:Y_Blocks.txt;management_link=}
-				</li>
 				<li>
 					{=var-set:m_link_href=Y_Settings_neutrino_forms.yhtm?form=neutrino_form-data_direct_recording=}
 					{=var-set:m_link_text={=L:set.menue.direct_recording=}=}
diff --git a/src/nhttpd/web/Y_Settings_personalize.yhtm b/src/nhttpd/web/Y_Settings_personalize.yhtm
index a4bce8d7f..58fd92d01 100644
--- a/src/nhttpd/web/Y_Settings_personalize.yhtm
+++ b/src/nhttpd/web/Y_Settings_personalize.yhtm
@@ -21,7 +21,6 @@ function do_init()
 	obj_set_radio_value('p_games', "{=ini-get:/var/tuxbox/config/neutrino.conf;personalize_games;1~cache=}");
 	obj_set_radio_value('p_audioplayer', "{=ini-get:/var/tuxbox/config/neutrino.conf;personalize_audioplayer;1~cache=}");
 	obj_set_radio_value('p_inetradio', "{=ini-get:/var/tuxbox/config/neutrino.conf;personalize_inetradio;1~cache=}");
-	obj_set_radio_value('p_esound', "{=ini-get:/var/tuxbox/config/neutrino.conf;personalize_esound;1~cache=}");
 	obj_set_radio_value('p_movieplayer', "{=ini-get:/var/tuxbox/config/neutrino.conf;personalize_movieplayer;1~cache=}");
 	obj_set_radio_value('p_picviewer', "{=ini-get:/var/tuxbox/config/neutrino.conf;personalize_pictureviewer;1~cache=}");
 	obj_set_radio_value('p_pinstatus', "{=ini-get:/var/tuxbox/config/neutrino.conf;personalize_pinstatus;0~cache=}");
@@ -134,13 +133,6 @@ function do_init()
 					<input type="radio" name="p_inetradio" value="2"/>PIN
 				</td>
 			</tr>
-			<tr><td>Esound Soundserver</td>
-				<td>
-					<input type="radio" name="p_esound" value="0"/>nicht sichtbar&nbsp;
-					<input type="radio" name="p_esound" value="1"/>sichtbar&nbsp;
-					<input type="radio" name="p_esound" value="2"/>PIN
-				</td>
-			</tr>
 			<tr><td>Movieplayer</td>
 				<td>
 					<input type="radio" name="p_movieplayer" value="0"/>nicht sichtbar&nbsp;
diff --git a/src/nhttpd/web/Y_Version.txt b/src/nhttpd/web/Y_Version.txt
index 14fadf2f3..1280b6a20 100644
--- a/src/nhttpd/web/Y_Version.txt
+++ b/src/nhttpd/web/Y_Version.txt
@@ -1,4 +1,4 @@
-version=2.8.0.65
+version=2.8.0.66
 date=05.12.2014
 type=Release
 info=Port CST
diff --git a/src/nhttpd/web/Y_neutrino_Blocks.txt b/src/nhttpd/web/Y_neutrino_Blocks.txt
index e69b9dbed..b4f703fbc 100644
--- a/src/nhttpd/web/Y_neutrino_Blocks.txt
+++ b/src/nhttpd/web/Y_neutrino_Blocks.txt
@@ -1305,49 +1305,6 @@ start-block~neutrino_direct_recording_save_settings
 {=ini-set:/var/tuxbox/config/neutrino.conf;recording_dir_permissions_0;{=recording_dir_permissions_0=}~save=}
 end-block~neutrino_direct_recording_save_settings
 
-# ------- Neutrino form-data: esound -------------------------------
-start-block~neutrino_form-data_esound
-<div class="work_box">
-	<div class="work_box_head"><div class="work_box_head_h2">
-	{=var-set:help_url=Help-Settings-Esound_Soundserver=}{=var-set:menu=Esound Soundserver=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
-	<div class="work_box_body">
-	<form name="f" action="/y/cgi">
-		<table cellspacing="0" border="0" cellpadding="2" width="100%">
-			<tr>
-				<td width="35%">Esound Port</td>
-				<td><input type="text" name="esound_port" size="5" maxlength="5" value="{=ini-get:/var/tuxbox/config/neutrino.conf;esound_port~open=}" title="esound port"/>&nbsp;default: 16001</td>
-			</tr>
-		</table>
-		<br/>
-		<input type="hidden" name="tmpl" value="Y_Settings_neutrino_forms.yhtm"/>
-		<input type="hidden" name="execute" value="include-block:Y_neutrino_Blocks.txt;neutrino_esound_save_settings;nix"/>
-		<input type="hidden" name="form" value="{=form=}"/>
-		{=include-block:Y_neutrino_Blocks.txt;neutrino_form_submit;nothing=}
-	</form>
-	</div>
-</div>
-
-<script type="text/javascript">
-//<![CDATA[
-function form_init()
-{
-}
-
-function do_submit()
-{
-	show_waitbox(true);
-	document.f.submit();
-}
-form_init();
-//]]>
-</script>
-end-block~neutrino_form-data_esound
-
-# ------- yWeb save Settings
-start-block~neutrino_esound_save_settings
-{=ini-set:/var/tuxbox/config/neutrino.conf;esound_port;{=esound_port=}=}
-end-block~neutrino_esound_save_settings
-
 # ------- list possible directorys for records
 start-block~neutrino_list_record_dirs
 <select name="rec_dir" id="rec_dir" class="y_live_button">
diff --git a/src/nhttpd/web/languages/Czech b/src/nhttpd/web/languages/Czech
index d747a1703..8eace700f 100644
--- a/src/nhttpd/web/languages/Czech
+++ b/src/nhttpd/web/languages/Czech
@@ -222,7 +222,6 @@ set.menue.parental=Rodičovská kontrola
 set.menue.direct_recording=Přímé nahrávání
 set.menue.recording=Nahrávání
 set.menue.audio_player=Přehrávač hudby
-set.menue.esound_server=Server Esound
 set.menue.movieplayer=Přehrávač filmů
 set.menue.pictureviewer=Prohlížeč obrázků
 set.menue.lcd_display=LCD zobrazovač
diff --git a/src/nhttpd/web/languages/Deutsch b/src/nhttpd/web/languages/Deutsch
index 51a45530d..61d62a87a 100644
--- a/src/nhttpd/web/languages/Deutsch
+++ b/src/nhttpd/web/languages/Deutsch
@@ -224,7 +224,6 @@ set.menue.parental=Jugendschutz
 set.menue.direct_recording=Direktaufnahme
 set.menue.recording=Aufnahme
 set.menue.audio_player=Audioplayer
-set.menue.esound_server=Esound Server
 set.menue.movieplayer=Movieplayer
 set.menue.pictureviewer=Bildbetrachter
 set.menue.lcd_display=LC-Display
diff --git a/src/nhttpd/web/languages/English b/src/nhttpd/web/languages/English
index 7f342bfe5..004558a54 100644
--- a/src/nhttpd/web/languages/English
+++ b/src/nhttpd/web/languages/English
@@ -227,7 +227,6 @@ set.menue.parental=Parental
 set.menue.direct_recording=Direct Recording
 set.menue.recording=Recording
 set.menue.audio_player=Audioplayer
-set.menue.esound_server=Esound Server
 set.menue.movieplayer=Movieplayer
 set.menue.pictureviewer=Picture Viewer
 set.menue.lcd_display=LC-Display
diff --git a/src/nhttpd/web/languages/Portuguese b/src/nhttpd/web/languages/Portuguese
index cab847312..1dffab32c 100644
--- a/src/nhttpd/web/languages/Portuguese
+++ b/src/nhttpd/web/languages/Portuguese
@@ -228,7 +228,6 @@ set.menue.parental=Parental
 set.menue.direct_recording=Gravação Directa
 set.menue.recording=Gravação
 set.menue.audio_player=Audioplayer
-set.menue.esound_server=Server Esound
 set.menue.movieplayer=Movieplayer
 set.menue.pictureviewer=Picture Viewer
 set.menue.lcd_display=LC-Display
diff --git a/src/nhttpd/web/languages/Slovak b/src/nhttpd/web/languages/Slovak
index 1d45f5f24..440ce4ea7 100644
--- a/src/nhttpd/web/languages/Slovak
+++ b/src/nhttpd/web/languages/Slovak
@@ -222,7 +222,6 @@ set.menue.parental=Rodičovská kontrola
 set.menue.direct_recording=Priame nahrávanie
 set.menue.recording=Nahrávanie
 set.menue.audio_player=Prehrávač hudby
-set.menue.esound_server=Server Esound
 set.menue.movieplayer=Prehrávač filmov
 set.menue.pictureviewer=Prehliadač obrázkov
 set.menue.lcd_display=LCD zobrazovač