From a62210d9746516ba7ca4192c912d65d134077419 Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Fri, 20 Jul 2012 23:45:13 +0200 Subject: [PATCH] - yweb: rework and enable movieplayer-settings --- src/nhttpd/web/Y_Settings_Menue.yhtm | 2 +- src/nhttpd/web/Y_neutrino_Blocks.txt | 220 +-------------------------- 2 files changed, 6 insertions(+), 216 deletions(-) diff --git a/src/nhttpd/web/Y_Settings_Menue.yhtm b/src/nhttpd/web/Y_Settings_Menue.yhtm index 332f7ac81..fd6c40a16 100644 --- a/src/nhttpd/web/Y_Settings_Menue.yhtm +++ b/src/nhttpd/web/Y_Settings_Menue.yhtm @@ -110,9 +110,9 @@ function init(){
  • {=L:set.menue.direct_recording=}
    • =}
  • {=L:set.menue.audio_player=}
    • +
  • {=L:set.menue.movieplayer=}
    • {=if-not-equal:{=global-var-get:boxtype=}~coolstream~
  • {=L:set.menue.esound_server=}
    • -
  • {=L:set.menue.movieplayer=}
    • ~=}
  • {=L:set.menue.pictureviewer=}
    • {=if-not-equal:{=global-var-get:boxtype=}~coolstream~ diff --git a/src/nhttpd/web/Y_neutrino_Blocks.txt b/src/nhttpd/web/Y_neutrino_Blocks.txt index 5c953b869..81cc238ca 100644 --- a/src/nhttpd/web/Y_neutrino_Blocks.txt +++ b/src/nhttpd/web/Y_neutrino_Blocks.txt @@ -324,142 +324,17 @@ start-block~neutrino_form-data_movieplayer
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
    {=L:set.mp.sources=}
    {=L:set.mp.streamingserver=} - {=L:off=}  - {=L:on=} -
    {=L:set.mp.streamingserver_ip=} - - -
    {=L:set.mp.streamingserver_port=} - - -
    {=L:set.mp.dvd_device=} - - -
    {=L:set.mp.vlc_dir=} - - -
    {=L:set.mp.transcoding=}
    {=L:set.mp.video_datarate=} - - -
    {=L:set.mp.transcode=} - {=L:off=}  - {=L:on=} - -
    {=L:set.mp.video_codec=} - - -
    {=L:set.mp.resolution=} - - -
    {=L:set.mp.audio_datarate=} - - -
    {=L:set.mp.transcode_audio=} - {=L:off=}  - {=L:on=} - -
    {=L:set.mp.force_ac3=} - {=L:off=}  - {=L:on=} - -
    {=L:set.mp.player=}
    {=L:set.mp.start_directory=}
    {=L:set.rec.epg_sectionsd=} -  ({=L:set.mp.only_movieplayer=}) -
    {=L:set.mp.used_buffer=} - {=L:off=}  - {=L:on=}  {=L:set.mp.only_movieplayer=} -
    {=L:set.mp.number_buffersegments=}({=L:set.mp.only_movieplayer=})
    {=L:set.mp.picture_in_browser=} - {=L:off=}  - {=L:on=} -

    - +    {=L:help=}
    @@ -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