mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-31 09:21:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++

Browse Source
This commit is contained in:
[CST] Focus
2012-07-21 12:51:45 +04:00
parent d593f8e859 05c4897504
commit 07bac9d650
9 changed files with 137 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
data/locale/deutsch.locale
View File

@@ -732,7 +732,7 @@ menu.hint_content_back Ändern Sie die Hintergrundfarbe für den Fensterinhalt
menu.hint_content_textcolor Ändern Sie die Textfarbe für den Fensterinhalt
menu.hint_contrast_fonts Wählen Sie mehr Schriftkontrast (absetzen vom Hintergrund)
menu.hint_dboxinfo Informationen über CPU und Arbeitsspeicher der Box
menu.hint_delete_channels Löschen aller Kanale
menu.hint_delete_channels Löschen aller Kanäle
menu.hint_epg_cache Maximum in Tagen zukünftiger EPG-Daten
menu.hint_epg_dir Speicherverzeichnis auf der Festplatte oder einen USB-Stick\nzum speichern von EPG-Daten
menu.hint_epg_extendedcache Maximum in Stunden, die die EPG-Daten zwischengespeichert\nwerden bzw. der Event-Beschreibungen
@@ -896,6 +896,60 @@ menu.hint_rotor_swap Tauschen der Rotordrehrichtung Ost/West\nim Motorsetup
menu.hint_rounded_corners Aktiviert die Darstellung abgerundeter Ecken für die OSD-Menüs
menu.hint_save_settings Speichern Sie alle Einstellungen im Image
menu.hint_saveas Speichern der Neutrino-HD-Einstellungen in eine Datei
menu.hint_scan_auto Auto-Scan ausgewählter Anbieter
menu.hint_scan_autoall Scannen Sie ihre ausgewählten Anbieter auf einmal
menu.hint_scan_autoall_select Nur in ausgewählten Satelliten scannen
menu.hint_scan_bouquet erneuern: hinzufügen zu den Bouquets, löschen: entfernt alte Bouquets, nicht ändern: Neue werden in "Andere" angefügt
menu.hint_scan_cable Wählen Sie ihr Kabelnetz zum scannen
menu.hint_scan_commited Wählen Sie ihre Einstellungen für diesen Satelliten
menu.hint_scan_diseqc Wählen Sie DiSEqC-Schalter-Eingangssignal für diesen Satelliten
menu.hint_scan_diseqcrepeat Diseqc Wiederholungen für kaskadierte Schaltungen,\nnutzen Sie die links/rechs Tasten
menu.hint_scan_diseqctype Wählen Sie ihr DiSEqC-Protokoll\nmit "Erweitert" können Sie ihre Anlage einbinden
menu.hint_scan_fast Schnell-Scan eines ausgewählten Anbieters\nWARNUNG: DiSEqC-Config wird überschrieben
menu.hint_scan_fastprov Wählen Sie einen Anbieter (Provider) zum scannen
menu.hint_scan_fasttype Wählen Sie das Sendeformat
menu.hint_scan_fec Wählen Sie eine Transponder-FEC
menu.hint_scan_femode Wählen Sie den Verbindungstyp für den zweiten Tuner
menu.hint_scan_fesetup Konfigurieren des oder der Tuner
menu.hint_scan_fetimeout Zeit bis zum warten des Signal, in 1/10 Sekunden,\nbenutzen Sie die links/rechts Tasten
menu.hint_scan_freq Geben Sie eine Transponder-Frequenz ein
menu.hint_scan_fta Lassen Sie nur frei empfangbare (nicht-verschlüsselte) Programme suchen
menu.hint_scan_ladirection Wählen Sie ihre Breitengrad-Ausrichtung
menu.hint_scan_latitude Geben Sie ihren Breitengrad ein
menu.hint_scan_lnbconfig Konfigurieren Sie LNB-Parameter für diesen Satelliten
menu.hint_scan_lodirection Wählen Sie ihre Längengrad-Ausrichtung
menu.hint_scan_lofh High-Banb LNB-Frequenz
menu.hint_scan_lofl Low-Band LNB-Frequenz
menu.hint_scan_lofs LNB-Band-Umschalter Frequenz
menu.hint_scan_longtitude Geben Sie ihren Längengrad ein
menu.hint_scan_manual Manueller Transponder-Scan mit ausgewählten Parametern
menu.hint_scan_mod Select transponder modulation
menu.hint_scan_motor_speed Rotor-Bewegungsgeschwindigkeit in 1/10 Grad pro Sekunde
menu.hint_scan_motorpos Wählen Sie eine gespeicherten Positions-Nummer für diesen Satelliten
menu.hint_scan_nid Hier können Sie ihre Kabelnetzwerk-Id in dezimal eingeben
menu.hint_scan_nit Hier kann man Transponder über gesendete NIT-Daten (Network Information Table) hinzufügen lassen
menu.hint_scan_pids Scant und speichert auch nur Audio / Video / PMT PIDs
menu.hint_scan_pol Wählen Sie eine Transponder-Polarisation
menu.hint_scan_rate Geben Sie eine Transponder-Symbolrate ein
menu.hint_scan_reset_numbers Zurücksetzen der existierender Kanalnummern und Umnummerierung nach einen Scan
menu.hint_scan_satadd Wählen Sie ihre verfügbaren Satelliten hier aus, für Ihren Anschluß
menu.hint_scan_satellite Wählen Sie die Satelliten zum scannen
menu.hint_scan_satenable Aktivieren Sie diesen Satelliten für ihre Anlage zum scannen
menu.hint_scan_satfind Sat-Finder: fahren Sie manuell Ihre Rotor-Positionen durch
menu.hint_scan_satfind_start Startet den Satellitenfinder für die Signalstärke
menu.hint_scan_satscan Scant den ausgewählten Satelliten
menu.hint_scan_satselect Ausgewählter Satellit
menu.hint_scan_satsetup Hier können Sie ihre gewählten Satelitten sehen und das LNB konfigurieren
menu.hint_scan_savesettings Speichert die Tuner-Config und Scan-Einstellungen,\ndiese bleiben dann erhalten für einen neuen Service-Scan
menu.hint_scan_scantype Wählen Sie, welche Kanal-Typen Sie scannen möchten
menu.hint_scan_setup_fe Konfigurieren Sie ihre ausgewählten Tuner
menu.hint_scan_start Startet die Kanalsuche mit den angegebenen Parametern.\nMit der 'EXIT' Taste kann man abbrechen
menu.hint_scan_test Testen Sie das Signal für diesen Transponder
menu.hint_scan_tpselect Wählen Sie einen einzelnen Transponder zum scannen
menu.hint_scan_uncommited Wählen Sie nicht festgeschriebene Angaben für diesen Satelliten
menu.hint_scan_usals_repeat Hier können Sie die USALS-Wiederholungen eingeben für den Rotor
menu.hint_scan_usalsall Setzen oder entfernen Sie USALS-Merker für alle Satelliten
menu.hint_scan_useusals Verwenden Sie USALS für diesen Satelitten
menu.hint_scrambled_message Bei aktivierter Option erscheint eine Meldung,\nwenn ein verschlüsselter Sender nicht entschlüsselt werden kann
menu.hint_screen_setup Konfigurieren Sie den Bildschirmbereich für die Menüanzeige
menu.hint_screenshot_count Hier können Sie wählen, wie viele Screenshots (1-5) erstellt werden sollen
@@ -1416,7 +1470,7 @@ satsetup.fe_mode_alone independent
satsetup.fe_mode_loop loop
satsetup.fe_mode_single single
satsetup.fe_mode_twin twin
satsetup.fe_setup Setup tuner
satsetup.fe_setup Setup Tuner
satsetup.lofh LNB High Offset
satsetup.lofl LNB Low Offset
satsetup.lofs LNB Switch Offset

1
src/gui/osd_setup.cpp
View File

@@ -38,7 +38,6 @@
#include "themes.h"
#include "screensetup.h"
#include "osdlang_setup.h"
#include "themes.h"
#include "filebrowser.h"
#include <global.h>

4
src/nhttpd/web/Y_Settings_Menue.yhtm
View File

@@ -58,8 +58,8 @@ function init(){
~
<li><a target="work" href="Y_Settings_yWeb.yhtm">yWeb</a></li>
<li><a target="work" href="Y_Settings_nhttpd.yhtm">{=L:set.menue.webserver=}</a></li>
{=if-not-equal:{=global-var-get:boxtype=}~coolstream~
<li><a target="work" href="Y_Settings_zapit.yhtm">{=L:set.menue.zapit=}</a></li>
{=if-not-equal:{=global-var-get:boxtype=}~coolstream~
<li><a target="work" href="Y_Settings_ucodes.yhtm">{=L:set.menue.ucodes=}</a></li>
<li><a target="work" href="Y_Tools_Bootlogo.yhtm">{=L:set.menue.boot_logo=}</a></li>
~=}
@@ -110,9 +110,9 @@ function init(){
<li><a target="work" href="Y_Settings_neutrino_forms.yhtm?form=neutrino_form-data_direct_recording">{=L:set.menue.direct_recording=}</a></li>
=}
<li><a target="work" href="Y_Settings_neutrino_forms.yhtm?form=neutrino_form-data_audioplayer">{=L:set.menue.audio_player=}</a></li>
<li><a target="work" href="Y_Settings_neutrino_forms.yhtm?form=neutrino_form-data_movieplayer">{=L:set.menue.movieplayer=}</a></li>
{=if-not-equal:{=global-var-get:boxtype=}~coolstream~
<li><a target="work" href="Y_Settings_neutrino_forms.yhtm?form=neutrino_form-data_esound">{=L:set.menue.esound_server=}</a></li>
<li><a target="work" href="Y_Settings_neutrino_forms.yhtm?form=neutrino_form-data_movieplayer">{=L:set.menue.movieplayer=}</a></li>
~=}
<li><a target="work" href="Y_Settings_neutrino_forms.yhtm?form=neutrino_form-data_pictureviewer">{=L:set.menue.pictureviewer=}</a></li>
{=if-not-equal:{=global-var-get:boxtype=}~coolstream~

29
src/nhttpd/web/Y_Settings_zapit.yhtm
View File

@@ -9,9 +9,11 @@ function do_submit()
else if (document.f.R1[1].checked == true)
_url="/control/exec?Y_Tools&zapit_upload&services.xml";
else if (document.f.R1[2].checked == true)
_url="/control/exec?Y_Tools&zapit_upload&ubouquets.xml";
else if (document.f.R1[3].checked == true)
_url="/control/exec?Y_Tools&zapit_upload&myservices.xml";
else
alert("Bitte eine Auswahl treffen");
alert("Please make a selection.\nBitte eine Auswahl treffen.");
document.f.action=_url;
document.f.submit();
}
@@ -26,24 +28,25 @@ function do_submit()
<table border="0" cellpadding="5" width="100%">
<tr><td width="50%" class="y_form_header">Upload</td><td class="y_form_header">Download</td></tr>
<tr>
<td>
<td valign="top">
<form name="f" method="post" enctype="multipart/form-data" action="">
<p>
<input type="radio" name="R1" checked="checked" value="bouquets.xml"/>bouquets.xml<br/>
<input type="radio" name="R1" value="bouquets.xml"/>bouquets.xml<br/>
<input type="radio" name="R1" value="services.xml"/>services.xml<br/>
<input type="radio" name="R1" value="ubouquets.xml"/>ubouquets.xml<br/>
<input type="radio" name="R1" value="myservices.xml"/>myservices.xml<br/>
<input type="file" name="F1" size="20"/><br/>
<button type="button" id="su" ytype="save" name="B1" title="upload selected file" onclick="do_submit()">Absenden</button>
<p>
<input type="file" name="F1" size="20"/><br/>
</p>
<p>
<button type="button" id="su" ytype="save" name="B1" title="upload selected file" onclick="do_submit()">Absenden</button>
</p>
</form>
</td>
<td>
<ul>
<li><a type="application/octet-stream" href="/var/tuxbox/config/zapit/bouquets.xml"><u>bouquets.xml</u></a></li>
<li><a type="application/octet-stream" href="/var/tuxbox/config/zapit/services.xml"><u>services.xml</u></a></li>
<li><a type="application/octet-stream" href="/var/tuxbox/config/zapit/myservices.xml"><u>myservices.xml</u></a></li>
</ul>
<td valign="top">
<a type="application/octet-stream" href="/var/tuxbox/config/zapit/bouquets.xml">bouquets.xml</a><br/>
<a type="application/octet-stream" href="/var/tuxbox/config/zapit/services.xml">services.xml</a><br/>
<a type="application/octet-stream" href="/var/tuxbox/config/zapit/ubouquets.xml">ubouquets.xml</a><br/>
<a type="application/octet-stream" href="/var/tuxbox/config/zapit/myservices.xml">myservices.xml</a><br/>
</td>
</tr>
</table>

13
src/nhttpd/web/Y_Timer_Edit.yhtm
View File

@@ -164,18 +164,7 @@ function init()
<tr id="RecDirRow" style="display:none">
<td>{=L:live.timer_edit.rec_dir=}:</td>
<td>
<select name="rec_dir" id="rec_dir" class="y_live_button">
<option value="{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_0;/mnt/filme~open=}" selected="selected">{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_0;/mnt/filme~cache=}</option>
<option value="{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_1;/mnt/filme~cache=}">{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_1;/mnt/filme~cache=}</option>
<option value="{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_2;/mnt/filme~cache=}">{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_2;/mnt/filme~cache=}</option>
<option value="{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_3;/mnt/filme~cache=}">{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_3;/mnt/filme~cache=}</option>
<option value="{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_4;/mnt/filme~cache=}">{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_4;/mnt/filme~cache=}</option>
<option value="{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_5;/mnt/filme~cache=}">{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_5;/mnt/filme~cache=}</option>
<option value="{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_6;/mnt/filme~cache=}">{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_6;/mnt/filme~cache=}</option>
<option value="{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_7;/mnt/filme~cache=}">{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_7;/mnt/filme~cache=}</option>
<option value="{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_8;/mnt/filme~cache=}">{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_8;/mnt/filme~cache=}</option>
<option value="{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_9;/mnt/filme~cache=}">{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_9;/mnt/filme~cache=}</option>
</select>
{=include-block:Y_neutrino_Blocks.txt;neutrino_list_record_dirs=}
</td>
</tr>
</table>

14
src/nhttpd/web/Y_Tools_Timer_Sync.yhtm
View File

@@ -23,19 +23,7 @@
<input type="radio" name="planer" value="slave" disabled="disabled"/>Slave box<br/>
<input type="radio" name="planer" value="slave" disabled="disabled"/>Test<br/> -->
{=L:live.timer-sync.rec_dir=}:
<select name="rec_dir" class="y_live_button">
<option value="{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_0;/mnt/filme~open=}" selected="selected">{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_0;/mnt/filme~cache=}</option>
<option value="{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_1;/mnt/filme~cache=}">{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_1;/mnt/filme~cache=}</option>
<option value="{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_2;/mnt/filme~cache=}">{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_2;/mnt/filme~cache=}</option>
<option value="{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_3;/mnt/filme~cache=}">{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_3;/mnt/filme~cache=}</option>
<option value="{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_4;/mnt/filme~cache=}">{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_4;/mnt/filme~cache=}</option>
<option value="{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_5;/mnt/filme~cache=}">{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_5;/mnt/filme~cache=}</option>
<option value="{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_6;/mnt/filme~cache=}">{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_6;/mnt/filme~cache=}</option>
<option value="{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_7;/mnt/filme~cache=}">{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_7;/mnt/filme~cache=}</option>
<option value="{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_8;/mnt/filme~cache=}">{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_8;/mnt/filme~cache=}</option>
<option value="{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_9;/mnt/filme~cache=}">{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_9;/mnt/filme~cache=}</option>
</select>
{=include-block:Y_neutrino_Blocks.txt;neutrino_list_record_dirs=}
<br/><a href="javascript:top.top_main.prim_menu.nav('settings', 'Y_Settings_Timer.yhtm');" class="inlink">{=L:live.timer-sync.settings=}</a>&nbsp;<input type="checkbox" name="debug" value="1"/>{=L:live.timer-sync.debugging=}</td>
</tr>
</table>

4
src/nhttpd/web/Y_Version.txt
View File

@@ -1,5 +1,5 @@
version=2.8.0.9
date=07.06.2012
version=2.8.0.12
date=20.07.2012
type=Release
info=Port Coolstream

277
src/nhttpd/web/Y_neutrino_Blocks.txt
View File

@@ -324,142 +324,17 @@ start-block~neutrino_form-data_movieplayer
<div class="work_box_body">
<form name="f" class="y_form" action="/y/cgi">
<table cellspacing="0" border="0" cellpadding="2" width="100%">
<tr><td colspan="2" class="y_form_header">{=L:set.mp.sources=}</td></tr>
<tr class="s">
<td width="35%">{=L:set.mp.streamingserver=}</td>
<td>
<input type="radio" name="streaming_type" value="0" onchange="change_streaming_type()"/>{=L:off=}&nbsp;
<input type="radio" name="streaming_type" value="1" onchange="change_streaming_type()"/>{=L:on=}
</td>
</tr>
<tr>
<td>{=L:set.mp.streamingserver_ip=}</td>
<td>
<input type="text" name="streaming_server_ip" size="20" title="server ip (xxx.xxx.xxx.xxx)"/>
<input type="hidden" name="h_streaming_server_ip"/>
</td>
</tr>
<tr>
<td>{=L:set.mp.streamingserver_port=}</td>
<td>
<input type="text" name="streaming_server_port" size="5" maxlength="5" title="port"/>
<input type="hidden" name="h_streaming_server_port"/>
</td>
</tr>
<tr>
<td>{=L:set.mp.dvd_device=}</td>
<td>
<input type="text" name="streaming_server_cddrive" size="10" title="DVD drive on server"/>
<input type="hidden" name="h_streaming_server_cddrive"/>
</td>
</tr>
<tr>
<td>{=L:set.mp.vlc_dir=}</td>
<td>
<input type="text" name="streaming_server_startdir" size="40" />
<input type="hidden" name="h_streaming_server_startdir"/>
</td>
</tr>
<tr><td colspan="2" class="y_form_header">{=L:set.mp.transcoding=}</td></tr>
<tr>
<td>{=L:set.mp.video_datarate=}</td>
<td>
<input type="text" name="streaming_videorate" size="6"/>
<input type="hidden" name="h_streaming_videorate"/>
</td>
</tr>
<tr>
<td>{=L:set.mp.transcode=}</td>
<td>
<input type="radio" name="streaming_force_transcode_video" value="0"/>{=L:off=}&nbsp;
<input type="radio" name="streaming_force_transcode_video" value="1"/>{=L:on=}
<input type="hidden" name="h_streaming_force_transcode_video"/>
</td>
</tr>
<tr>
<td>{=L:set.mp.video_codec=}</td>
<td>
<select name="streaming_transcode_video_codec" >
<option value="0" selected="selected">MPEG1</option>
<option value="1">MPEG2</option>
</select>
<input type="hidden" name="h_streaming_transcode_video_codec"/>
</td>
</tr>
<tr>
<td>{=L:set.mp.resolution=}</td>
<td>
<select name="streaming_resolution">
<option value="0" selected="selected">352 x 288</option>
<option value="1">352 x 576</option>
<option value="2">480 x 576</option>
<option value="3">704 x 576</option>
</select>
<input type="hidden" name="h_streaming_resolution"/>
</td>
</tr>
<tr>
<td>{=L:set.mp.audio_datarate=}</td>
<td>
<input type="text" name="streaming_audiorate" size="6"/>
<input type="hidden" name="h_streaming_audiorate"/>
</td>
</tr>
<tr>
<td>{=L:set.mp.transcode_audio=}</td>
<td>
<input type="radio" name="streaming_transcode_audio" value="0"/>{=L:off=}&nbsp;
<input type="radio" name="streaming_transcode_audio" value="1"/>{=L:on=}
<input type="hidden" name="h_streaming_transcode_audio"/>
</td>
</tr>
<tr>
<td>{=L:set.mp.force_ac3=}</td>
<td>
<input type="radio" name="streaming_force_avi_rawaudio" value="0"/>{=L:off=}&nbsp;
<input type="radio" name="streaming_force_avi_rawaudio" value="1"/>{=L:on=}
<input type="hidden" name="h_streaming_force_avi_rawaudio"/>
</td>
</tr>
<tr><td colspan="2" class="y_form_header">{=L:set.mp.player=}</td></tr>
<tr>
<td>{=L:set.mp.start_directory=}</td>
<td><input type="text" name="streaming_moviedir" size="40" /></td>
</tr>
<tr>
<td width="35%">{=L:set.rec.epg_sectionsd=}</td>
<td>
<select name="stopsectionsd_mp">
<option value="0" selected="selected">{=L:set.rec.dont_stop=}</option>
<option value="1">{=L:set.rec.stop=}</option>
<option value="2">{=L:set.rec.restart=}</option>
</select>&nbsp;({=L:set.mp.only_movieplayer=})
</td>
</tr>
<tr>
<td>{=L:set.mp.used_buffer=}</td>
<td>
<input type="radio" name="streaming_use_buffer" value="0" title="WabberQueue: off"/>{=L:off=}&nbsp;
<input type="radio" name="streaming_use_buffer" value="1" title="WabberQueue: on"/>{=L:on=}&nbsp;&nbsp;{=L:set.mp.only_movieplayer=}
</td>
</tr>
<tr>
<td>{=L:set.mp.number_buffersegments=}</td>
<td><input type="text" name="streaming_buffer_segment_size" size="2" maxlength="2" /><span style="position:absolute; left:424px;">({=L:set.mp.only_movieplayer=})</span></td>
</tr>
<tr>
<td>{=L:set.mp.picture_in_browser=}</td>
<td>
<input type="radio" name="streaming_show_tv_in_browser" value="0"/>{=L:off=}&nbsp;
<input type="radio" name="streaming_show_tv_in_browser" value="1"/>{=L:on=}
</td>
<td><input type="text" name="network_nfs_moviedir" size="40" /></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_movieplayer_save_settings;nix"/>
<input type="hidden" name="form" value="{=form=}"/>
<button type="button" ytype="save" title="{=L:save_values_desc=}s" onclick="do_submit()">{=L:save=}</button>
<button type="button" ytype="save" title="{=L:save_values_desc=}" onclick="do_submit()">{=L:save=}</button>
&nbsp;<button type="button" ytype="refresh" onclick="dbox_reload_neutrino()">{=L:set.reload_neutrino=}</button>
&nbsp;<a href="javascript:top.top_main.prim_menu.nav('info', 'Y_Info_Help.yhtm');" class="inlink">{=L:help=}</a>
</form>
@@ -470,80 +345,11 @@ start-block~neutrino_form-data_movieplayer
function form_init()
{
var val = "";
obj_set_radio_value('streaming_type', "{=ini-get:/var/tuxbox/config/neutrino.conf;streaming_type;0~open=}");
val = "{=ini-get:/var/tuxbox/config/neutrino.conf;streaming_server_ip~cache=}";
document.f.streaming_server_ip.value = val;
val = "{=ini-get:/var/tuxbox/config/neutrino.conf;streaming_server_port;8080~cache=}";
document.f.streaming_server_port.value = val;
val = "{=ini-get:/var/tuxbox/config/neutrino.conf;streaming_server_cddrive;D:~cache=}";
document.f.streaming_server_cddrive.value = val;
val = "{=ini-get:/var/tuxbox/config/neutrino.conf;streaming_server_startdir;C:/Movies~cache=}";
document.f.streaming_server_startdir.value = val;
val = "{=ini-get:/var/tuxbox/config/neutrino.conf;streaming_videorate;1000~cache=}";
document.f.streaming_videorate.value = val;
obj_set_radio_value('streaming_force_transcode_video', "{=ini-get:/var/tuxbox/config/neutrino.conf;streaming_force_transcode_video;0~cache=}");
val = "{=ini-get:/var/tuxbox/config/neutrino.conf;streaming_transcode_video_codec;0~cache=}";
document.f.streaming_transcode_video_codec.selectedIndex = val;
val = "{=ini-get:/var/tuxbox/config/neutrino.conf;streaming_resolution;0~cache=}";
document.f.streaming_resolution.selectedIndex = val;
val = "{=ini-get:/var/tuxbox/config/neutrino.conf;streaming_audiorate;192~cache=}";
document.f.streaming_audiorate.value = val;
obj_set_radio_value('streaming_transcode_audio', "{=ini-get:/var/tuxbox/config/neutrino.conf;streaming_transcode_audio;0~cache=}");
obj_set_radio_value('streaming_force_avi_rawaudio', "{=ini-get:/var/tuxbox/config/neutrino.conf;streaming_force_avi_rawaudio;0~cache=}");
val = "{=ini-get:/var/tuxbox/config/neutrino.conf;streaming_moviedir~cache=}";
document.f.streaming_moviedir.value = val;
val = "{=ini-get:/var/tuxbox/config/neutrino.conf;streaming_stopsectionsd;1~cache=}";
document.f.stopsectionsd_mp.selectedIndex = val;
obj_set_radio_value('streaming_use_buffer', "{=ini-get:/var/tuxbox/config/neutrino.conf;streaming_use_buffer;1~cache=}");
val = "{=ini-get:/var/tuxbox/config/neutrino.conf;streaming_buffer_segment_size;24~cache=}";
document.f.streaming_buffer_segment_size.value = val;
obj_set_radio_value('streaming_show_tv_in_browser', "{=ini-get:/var/tuxbox/config/neutrino.conf;streaming_show_tv_in_browser;0~cache=}");
change_streaming_type();
}
function change_streaming_type()
{
var vis = document.f.streaming_type[0].checked;
document.f.streaming_server_ip.disabled = vis;
document.f.streaming_server_port.disabled = vis;
document.f.streaming_server_cddrive.disabled = vis;
document.f.streaming_server_startdir.disabled = vis;
document.f.streaming_videorate.disabled = vis;
document.f.streaming_force_transcode_video[0].disabled = vis;
document.f.streaming_force_transcode_video[1].disabled = vis;
document.f.streaming_transcode_video_codec.disabled = vis;
document.f.streaming_resolution.disabled = vis;
document.f.streaming_audiorate.disabled = vis;
document.f.streaming_transcode_audio[0].disabled = vis;
document.f.streaming_transcode_audio[1].disabled = vis;
document.f.streaming_force_avi_rawaudio[0].disabled = vis;
document.f.streaming_force_avi_rawaudio[1].disabled = vis;
}
function set_hidden_values()
{
document.f.h_streaming_server_ip.value = document.f.streaming_server_ip.value;
document.f.h_streaming_server_port.value = document.f.streaming_server_port.value;
document.f.h_streaming_server_cddrive.value = document.f.streaming_server_cddrive.value;
document.f.h_streaming_server_startdir.value = document.f.streaming_server_startdir.value;
document.f.h_streaming_videorate.value = document.f.streaming_videorate.value;
document.f.h_streaming_force_transcode_video.value = obj_get_radio_value("streaming_force_transcode_video");
document.f.h_streaming_transcode_video_codec.value = document.f.streaming_transcode_video_codec.selectedIndex;
document.f.h_streaming_resolution.value = document.f.streaming_resolution.selectedIndex;
document.f.h_streaming_audiorate.value = document.f.streaming_audiorate.value;
document.f.h_streaming_transcode_audio.value = obj_get_radio_value("streaming_transcode_audio");
document.f.h_streaming_force_avi_rawaudio.value = obj_get_radio_value("streaming_force_avi_rawaudio");
val = "{=ini-get:/var/tuxbox/config/neutrino.conf;network_nfs_moviedir~open=}";
document.f.network_nfs_moviedir.value = val;
}
function do_submit()
{
set_hidden_values();
show_waitbox(true);
document.f.submit();
}
@@ -554,23 +360,7 @@ end-block~neutrino_form-data_movieplayer
# ------- yWeb save Settings
start-block~neutrino_movieplayer_save_settings
{=ini-set:/var/tuxbox/config/neutrino.conf;streaming_type;{=streaming_type=}~open=}
{=ini-set:/var/tuxbox/config/neutrino.conf;streaming_server_ip;{=h_streaming_server_ip=}~cache=}
{=ini-set:/var/tuxbox/config/neutrino.conf;streaming_server_port;{=h_streaming_server_port=}~cache=}
{=ini-set:/var/tuxbox/config/neutrino.conf;streaming_server_cddrive;{=h_streaming_server_cddrive=}~cache=}
{=ini-set:/var/tuxbox/config/neutrino.conf;streaming_server_startdir;{=h_streaming_server_startdir=}~cache=}
{=ini-set:/var/tuxbox/config/neutrino.conf;streaming_videorate;{=h_streaming_videorate=}~cache=}
{=ini-set:/var/tuxbox/config/neutrino.conf;streaming_force_transcode_video;{=h_streaming_force_transcode_video=}~cache=}
{=ini-set:/var/tuxbox/config/neutrino.conf;streaming_transcode_video_codec;{=h_streaming_transcode_video_codec=}~cache=}
{=ini-set:/var/tuxbox/config/neutrino.conf;streaming_resolution;{=h_streaming_resolution=}~cache=}
{=ini-set:/var/tuxbox/config/neutrino.conf;streaming_audiorate;{=h_streaming_audiorate=}~cache=}
{=ini-set:/var/tuxbox/config/neutrino.conf;streaming_transcode_audio;{=h_streaming_transcode_audio=}~cache=}
{=ini-set:/var/tuxbox/config/neutrino.conf;streaming_force_avi_rawaudio;{=h_streaming_force_avi_rawaudio=}~cache=}
{=ini-set:/var/tuxbox/config/neutrino.conf;streaming_moviedir;{=streaming_moviedir=}~cache=}
{=ini-set:/var/tuxbox/config/neutrino.conf;streaming_stopsectionsd;{=stopsectionsd_mp=}~cache=}
{=ini-set:/var/tuxbox/config/neutrino.conf;streaming_use_buffer;{=streaming_use_buffer=}~cache=}
{=ini-set:/var/tuxbox/config/neutrino.conf;streaming_buffer_segment_size;{=streaming_buffer_segment_size=}~cache=}
{=ini-set:/var/tuxbox/config/neutrino.conf;streaming_show_tv_in_browser;{=streaming_show_tv_in_browser=}~save=}
{=ini-set:/var/tuxbox/config/neutrino.conf;network_nfs_moviedir;{=network_nfs_moviedir=}=}
end-block~neutrino_movieplayer_save_settings
@@ -1187,7 +977,7 @@ start-block~neutrino_form-data_pictureviewer
</tr>
<tr>
<td>{=L:set.pv.start_dir=}</td>
<td><input type="text" name="picviewer_picturedir" size="20" value="{=ini-get:/var/tuxbox/config/neutrino.conf;picviewer_picturedir~cache=}" /></td>
<td><input type="text" name="network_nfs_picturedir" size="20" value="{=ini-get:/var/tuxbox/config/neutrino.conf;network_nfs_picturedir~cache=}" /></td>
</tr>
{=if-not-equal:{=global-var-get:boxtype=}~coolstream~
<tr>
@@ -1234,7 +1024,7 @@ end-block~neutrino_form-data_pictureviewer
start-block~neutrino_pictureviewer_save_settings
{=ini-set:/var/tuxbox/config/neutrino.conf;picviewer_scaling;{=picviewer_scaling=}~open=}
{=ini-set:/var/tuxbox/config/neutrino.conf;picviewer_slide_time;{=picviewer_slide_time=}~cache=}
{=ini-set:/var/tuxbox/config/neutrino.conf;picviewer_picturedir;{=picviewer_picturedir=}~cache=}
{=ini-set:/var/tuxbox/config/neutrino.conf;network_nfs_picturedir;{=network_nfs_picturedir=}~cache=}
{=ini-set:/var/tuxbox/config/neutrino.conf;picviewer_decode_server_ip;{=picviewer_decode_server_ip=}~cache=}
{=ini-set:/var/tuxbox/config/neutrino.conf;picviewer_decode_server_port;{=picviewer_decode_server_port=}~save=}
end-block~neutrino_pictureviewer_save_settings
@@ -1297,7 +1087,7 @@ start-block~neutrino_form-data_audioplayer
</tr>
<tr>
<td>{=L:set.ap.start_dir=}</td>
<td><input type="text" name="audioplayer_audioplayerdir" size="20" value="{=ini-get:/var/tuxbox/config/neutrino.conf;audioplayer_audioplayerdir~cache=}" /></td>
<td><input type="text" name="network_nfs_audioplayerdir" size="20" value="{=ini-get:/var/tuxbox/config/neutrino.conf;network_nfs_audioplayerdir~cache=}" /></td>
</tr>
<tr>
<td>{=L:set.ap.parse_shoutcast=}</td>
@@ -1352,7 +1142,7 @@ start-block~neutrino_audioplayer_save_settings
{=ini-set:/var/tuxbox/config/neutrino.conf;audioplayer_show_playlist;{=audioplayer_show_playlist=}~cache=}
{=ini-set:/var/tuxbox/config/neutrino.conf;audioplayer_screensaver;{=audioplayer_screensaver=}~cache=}
{=ini-set:/var/tuxbox/config/neutrino.conf;audioplayer_highprio;{=audioplayer_highprio=}~cache=}
{=ini-set:/var/tuxbox/config/neutrino.conf;audioplayer_audioplayerdir;{=audioplayer_audioplayerdir=}~cache=}
{=ini-set:/var/tuxbox/config/neutrino.conf;network_nfs_audioplayerdir;{=network_nfs_audioplayerdir=}~cache=}
{=ini-set:/var/tuxbox/config/neutrino.conf;audioplayer_enable_sc_metadata;{=audioplayer_enable_sc_metadata=}~save=}
end-block~neutrino_audioplayer_save_settings
@@ -1583,3 +1373,52 @@ 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">
<option value="{=ini-get:/var/tuxbox/config/neutrino.conf;network_nfs_recordingdir~open=}" selected="selected">
{=ini-get:/var/tuxbox/config/neutrino.conf;network_nfs_recordingdir~cache=}
</option>
{=if-empty:{=ini-get:/var/tuxbox/config/neutrino.conf;network_nfs_local_dir_0~cache=}~~
<option value="{=ini-get:/var/tuxbox/config/neutrino.conf;network_nfs_local_dir_0~cache=}">
{=ini-get:/var/tuxbox/config/neutrino.conf;network_nfs_local_dir_0~cache=}
</option>
=}
{=if-empty:{=ini-get:/var/tuxbox/config/neutrino.conf;network_nfs_local_dir_1~cache=}~~
<option value="{=ini-get:/var/tuxbox/config/neutrino.conf;network_nfs_local_dir_1~cache=}">
{=ini-get:/var/tuxbox/config/neutrino.conf;network_nfs_local_dir_1~cache=}
</option>
=}
{=if-empty:{=ini-get:/var/tuxbox/config/neutrino.conf;network_nfs_local_dir_2~cache=}~~
<option value="{=ini-get:/var/tuxbox/config/neutrino.conf;network_nfs_local_dir_2~cache=}">
{=ini-get:/var/tuxbox/config/neutrino.conf;network_nfs_local_dir_2~cache=}
</option>
=}
{=if-empty:{=ini-get:/var/tuxbox/config/neutrino.conf;network_nfs_local_dir_3~cache=}~~
<option value="{=ini-get:/var/tuxbox/config/neutrino.conf;network_nfs_local_dir_3~cache=}">
{=ini-get:/var/tuxbox/config/neutrino.conf;network_nfs_local_dir_3~cache=}
</option>
=}
{=if-empty:{=ini-get:/var/tuxbox/config/neutrino.conf;network_nfs_local_dir_4~cache=}~~
<option value="{=ini-get:/var/tuxbox/config/neutrino.conf;network_nfs_local_dir_4~cache=}">
{=ini-get:/var/tuxbox/config/neutrino.conf;network_nfs_local_dir_4~cache=}
</option>
=}
{=if-empty:{=ini-get:/var/tuxbox/config/neutrino.conf;network_nfs_local_dir_5~cache=}~~
<option value="{=ini-get:/var/tuxbox/config/neutrino.conf;network_nfs_local_dir_5~cache=}">
{=ini-get:/var/tuxbox/config/neutrino.conf;network_nfs_local_dir_5~cache=}
</option>
=}
{=if-empty:{=ini-get:/var/tuxbox/config/neutrino.conf;network_nfs_local_dir_6~cache=}~~
<option value="{=ini-get:/var/tuxbox/config/neutrino.conf;network_nfs_local_dir_6~cache=}">
{=ini-get:/var/tuxbox/config/neutrino.conf;network_nfs_local_dir_6~cache=}
</option>
=}
{=if-empty:{=ini-get:/var/tuxbox/config/neutrino.conf;network_nfs_local_dir_7~cache=}~~
<option value="{=ini-get:/var/tuxbox/config/neutrino.conf;network_nfs_local_dir_7~cache=}">
{=ini-get:/var/tuxbox/config/neutrino.conf;network_nfs_local_dir_7~cache=}
</option>
=}
</select>
end-block~neutrino_list_record_dirs

2
src/nhttpd/web/scripts/Y_Tools.sh
View File

@@ -188,7 +188,7 @@ ucodes_upload()
# -----------------------------------------------------------
zapit_upload()
{
msg="$1 hochgeladen<br><a href='/Y_Settings_zapit.htm'><u>next file</u></a>"
msg="$1 hochgeladen<br><a href='/Y_Settings_zapit.yhtm'><u>next file</u></a>"
upload_copy "$y_path_zapit/$1"
y_format_message_html
}