From 9dff920fb834d43a8967d1ff70555828e6474fe1 Mon Sep 17 00:00:00 2001 From: yjogol Date: Sun, 14 Mar 2010 07:55:42 +0000 Subject: [PATCH] yweb: 2.8.0.0 Release git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@483 e54a6e83-5905-42d5-8d5c-058d10e6a962 --- .../tuxboxapi/coolstream/controlapi.cpp | 124 +++++++---------- src/nhttpd/web/Y_Blocks.txt | 7 - src/nhttpd/web/Y_Boxcontrol_Bouquetlist.yhtm | 2 +- src/nhttpd/web/Y_Ext_Update_refresh.yhtm | 7 +- src/nhttpd/web/Y_Live_Msg.yhtm | 6 +- src/nhttpd/web/Y_Live_Record.yhtm | 36 ++--- src/nhttpd/web/Y_Live_Transcode.yhtm | 30 ++--- src/nhttpd/web/Y_Settings_Live.yhtm | 30 ++--- src/nhttpd/web/Y_Settings_nhttpd.yhtm | 4 +- src/nhttpd/web/Y_Timer_Menue.yhtm | 24 ---- src/nhttpd/web/Y_Tools_NetStream.yhtm | 125 ------------------ src/nhttpd/web/Y_Version.txt | 6 +- src/nhttpd/web/languages/Deutsch | 41 ++++++ src/nhttpd/web/languages/English | 41 ++++++ src/nhttpd/yconfig.h | 2 +- 15 files changed, 194 insertions(+), 291 deletions(-) delete mode 100644 src/nhttpd/web/Y_Timer_Menue.yhtm delete mode 100644 src/nhttpd/web/Y_Tools_NetStream.yhtm diff --git a/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp b/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp index 75250e200..4213940ae 100644 --- a/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp +++ b/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp @@ -606,52 +606,52 @@ struct key { #endif static const struct key keynames[] = { - {"KEY_POWER", KEY_POWER}, - {"KEY_MUTE", KEY_MUTE}, - {"KEY_1", KEY_1}, - {"KEY_2", KEY_2}, - {"KEY_3", KEY_3}, - {"KEY_4", KEY_4}, - {"KEY_5", KEY_5}, - {"KEY_6", KEY_6}, - {"KEY_7", KEY_7}, - {"KEY_8", KEY_8}, - {"KEY_9", KEY_9}, - {"KEY_0", KEY_0}, - {"KEY_INFO", KEY_INFO}, - {"KEY_MODE", KEY_MODE}, - {"KEY_SETUP", KEY_MENU}, - {"KEY_EPG", KEY_EPG}, - {"KEY_FAVORITES", KEY_FAVORITES}, - {"KEY_HOME", KEY_EXIT}, - {"KEY_UP", KEY_UP}, - {"KEY_LEFT", KEY_LEFT}, - {"KEY_OK", KEY_OK}, - {"KEY_RIGHT", KEY_RIGHT}, - {"KEY_DOWN", KEY_DOWN}, - {"KEY_VOLUMEUP", KEY_VOLUMEUP}, - {"KEY_VOLUMEDOWN", KEY_VOLUMEDOWN}, - {"KEY_PAGEUP", KEY_PAGEUP}, - {"KEY_PAGEDOWN", KEY_PAGEDOWN}, - {"KEY_TV", KEY_TV}, - {"KEY_TEXT", KEY_TEXT}, - {"KEY_RADIO", KEY_RADIO}, - {"KEY_RED", KEY_RED}, - {"KEY_GREEN", KEY_GREEN}, - {"KEY_YELLOW", KEY_YELLOW}, - {"KEY_BLUE", KEY_BLUE}, - {"KEY_SAT", KEY_SAT}, - {"KEY_HELP", KEY_HELP}, - {"KEY_NEXT", KEY_NEXT}, - {"KEY_PREVIOUS", KEY_PREVIOUS}, - {"KEY_TIME", KEY_TIME}, - {"KEY_AUDIO", KEY_AUDIO}, - {"KEY_REWIND", KEY_REWIND}, - {"KEY_FORWARD", KEY_FORWARD}, - {"KEY_PAUSE", KEY_PAUSE}, - {"KEY_RECORD", KEY_RECORD}, - {"KEY_STOP", KEY_STOP}, - {"KEY_PLAY", KEY_PLAY} + {"KEY_POWER", KEY_POWER}, + {"KEY_MUTE", KEY_MUTE}, + {"KEY_1", KEY_1}, + {"KEY_2", KEY_2}, + {"KEY_3", KEY_3}, + {"KEY_4", KEY_4}, + {"KEY_5", KEY_5}, + {"KEY_6", KEY_6}, + {"KEY_7", KEY_7}, + {"KEY_8", KEY_8}, + {"KEY_9", KEY_9}, + {"KEY_0", KEY_0}, + {"KEY_INFO", KEY_INFO}, + {"KEY_MODE", KEY_MODE}, + {"KEY_SETUP", KEY_MENU}, + {"KEY_EPG", KEY_EPG}, + {"KEY_FAVORITES", KEY_FAVORITES}, + {"KEY_HOME", KEY_EXIT}, + {"KEY_UP", KEY_UP}, + {"KEY_LEFT", KEY_LEFT}, + {"KEY_OK", KEY_OK}, + {"KEY_RIGHT", KEY_RIGHT}, + {"KEY_DOWN", KEY_DOWN}, + {"KEY_VOLUMEUP", KEY_VOLUMEUP}, + {"KEY_VOLUMEDOWN", KEY_VOLUMEDOWN}, + {"KEY_PAGEUP", KEY_PAGEUP}, + {"KEY_PAGEDOWN", KEY_PAGEDOWN}, + {"KEY_TV", KEY_TV}, + {"KEY_TEXT", KEY_TEXT}, + {"KEY_RADIO", KEY_RADIO}, + {"KEY_RED", KEY_RED}, + {"KEY_GREEN", KEY_GREEN}, + {"KEY_YELLOW", KEY_YELLOW}, + {"KEY_BLUE", KEY_BLUE}, + {"KEY_SAT", KEY_SAT}, + {"KEY_HELP", KEY_HELP}, + {"KEY_NEXT", KEY_NEXT}, + {"KEY_PREVIOUS", KEY_PREVIOUS}, + {"KEY_TIME", KEY_TIME}, + {"KEY_AUDIO", KEY_AUDIO}, + {"KEY_REWIND", KEY_REWIND}, + {"KEY_FORWARD", KEY_FORWARD}, + {"KEY_PAUSE", KEY_PAUSE}, + {"KEY_RECORD", KEY_RECORD}, + {"KEY_STOP", KEY_STOP}, + {"KEY_PLAY", KEY_PLAY} }; // The code here is based on rcsim. Thx Carjay! @@ -792,7 +792,6 @@ void CControlAPI::CryptCGI(CyhookHandler *hh) //TODO: more } - //----------------------------------------------------------------------------- void CControlAPI::ChannellistCGI(CyhookHandler *hh) { @@ -1177,7 +1176,6 @@ void CControlAPI::StartPluginCGI(CyhookHandler *hh) } else hh->SendError(); - } else hh->SendError(); @@ -1220,26 +1218,10 @@ void CControlAPI::SendChannelList(CyhookHandler *hh) //----------------------------------------------------------------------------- void CControlAPI::SendStreamInfo(CyhookHandler *hh) { - - int bitInfo[10]; - NeutrinoAPI->GetStreamInfo(bitInfo); - hh->printf("%d\n%d\n", bitInfo[0], bitInfo[1] ); //Resolution x y - hh->printf("%d\n", bitInfo[4]*50); //Bitrate bit/sec - - switch (bitInfo[2]) //format - { - case 2: hh->Write("4:3\n"); break; - case 3: hh->Write("16:9\n"); break; - case 4: hh->Write("2.21:1\n"); break; - default: hh->Write("unknown\n"); break; - } - switch (bitInfo[3]) //fps - { - case 3: hh->Write("25\n"); break; - case 6: hh->Write("50\n"); break; - default: hh->Write("unknown\n"); - } - hh->WriteLn(NeutrinoAPI->audiotype_names[bitInfo[6]]); + hh->WriteLn(NeutrinoAPI->getVideoResolutionAsString()); + hh->WriteLn(NeutrinoAPI->getVideoAspectRatioAsString()); + hh->WriteLn(NeutrinoAPI->getVideoFramerateAsString()); + hh->WriteLn(NeutrinoAPI->getAudioInfoAsString()); } //----------------------------------------------------------------------------- @@ -1629,7 +1611,6 @@ void CControlAPI::doNewTimer(CyhookHandler *hh) if(((int)rep) >= ((int)CTimerd::TIMERREPEAT_WEEKDAYS) && hh->ParamList["wd"] != "") NeutrinoAPI->Timerd->getWeekdaysFromStr(&rep, hh->ParamList["wd"].c_str()); -#if 0 //FIXME // apids bool changeApids=false; unsigned char apids=0; @@ -1656,7 +1637,6 @@ void CControlAPI::doNewTimer(CyhookHandler *hh) apids |= TIMERD_APIDS_AC3; } } -#endif CTimerd::RecordingInfo recinfo; CTimerd::EventInfo eventinfo; eventinfo.epgID = 0; @@ -1693,10 +1673,8 @@ void CControlAPI::doNewTimer(CyhookHandler *hh) _rec_dir = Config->getString("network_nfs_recordingdir", "/mnt/filme"); delete Config;//Memory leak: Config } -#if 0 //FIXME? if(changeApids) eventinfo.apids = apids; -#endif recinfo = eventinfo; strncpy(recinfo.recordingDir, _rec_dir.c_str(), RECORD_DIR_MAXLEN-1); data = &recinfo; @@ -1930,7 +1908,7 @@ void CControlAPI::build_live_url(CyhookHandler *hh) //url += (mode == CZapitClient::MODE_TV) ? ":31339/0," : ":31338/"; url += ":31339/0,"; url += xpids; -printf("Live url: %s\n", url.c_str()); + // response url if(hh->ParamList["vlc_link"] !="") { diff --git a/src/nhttpd/web/Y_Blocks.txt b/src/nhttpd/web/Y_Blocks.txt index 7b7b85f9c..37db19337 100644 --- a/src/nhttpd/web/Y_Blocks.txt +++ b/src/nhttpd/web/Y_Blocks.txt @@ -445,13 +445,6 @@ start-block~frame_live_directtv {=include-block:Y_Blocks.txt;frame_secondary=} end-block~frame_live_directtv -# ------- Lay-Frame Timer-Menu -start-block~frame_timer -{=var-set:sec_menu=Y_Timer_Menue.yhtm=} -{=var-set:work=Y_blank.htm=} -{=include-block:Y_Blocks.txt;frame_secondary=} -end-block~frame_timer - # ------- Lay-Frame Tools-Menu start-block~frame_tools {=var-set:sec_menu=Y_Tools_Menue.yhtm=} diff --git a/src/nhttpd/web/Y_Boxcontrol_Bouquetlist.yhtm b/src/nhttpd/web/Y_Boxcontrol_Bouquetlist.yhtm index a55389a43..1a2ed2e66 100644 --- a/src/nhttpd/web/Y_Boxcontrol_Bouquetlist.yhtm +++ b/src/nhttpd/web/Y_Boxcontrol_Bouquetlist.yhtm @@ -3,7 +3,7 @@ - + {=func:get_bouquets_as_templatelist =}
Channels
{=L:bc.channels=}
%s
diff --git a/src/nhttpd/web/Y_Ext_Update_refresh.yhtm b/src/nhttpd/web/Y_Ext_Update_refresh.yhtm index ec5f2e528..c2b949dad 100644 --- a/src/nhttpd/web/Y_Ext_Update_refresh.yhtm +++ b/src/nhttpd/web/Y_Ext_Update_refresh.yhtm @@ -4,8 +4,7 @@ @@ -153,27 +153,27 @@ function doRecord()
- + - + - + - + {=if-equal:{=mode=}~tv~ - + - + - + - + - + - + =} - + - + - + - +
Record Mode
{=L:live.rec.record_mode=}
Filename:{=L:live.rec.filename=}:
- Display on  - Transcoding on + {=L:live.rec.display_on=}  + {=L:live.rec.transcoding_on=}

+  {=L:live.rec.record=}

Record Transcode

{=L:live.rec.tanscode=}
Profile:{=L:live.rec.profile=}:

Video		 

{=L:live.rec.video=}		 
Breite:{=L:live.rec.width=}: Höhe:{=L:live.rec.height=}:
Codec:{=L:live.rec.codec=}: Bitrate:{=L:live.rec.bitrate=}:
Scale:{=L:live.rec.scale=}:  
Audio 
{=L:live.rec.audio=} 
Codec:{=L:live.rec.codec=}: Bitrate:{=L:live.rec.bitrate=}:
Channels:{=L:live.rec.channels=}: - - + + - + - + - + - + - + - + - + - + - + - + - + - + @@ -168,7 +168,7 @@ function doTranscode() diff --git a/src/nhttpd/web/Y_Settings_Live.yhtm b/src/nhttpd/web/Y_Settings_Live.yhtm index bb9126cc4..69e8256b6 100644 --- a/src/nhttpd/web/Y_Settings_Live.yhtm +++ b/src/nhttpd/web/Y_Settings_Live.yhtm @@ -14,32 +14,32 @@ function do_refresh_liveview() {=var-set:wait_text={=L:save_values=}=}{=include-block:Y_Blocks.txt;snip_wait=}
Transcode-Broadcast

Video		 
{=L:live.rec.trans_broadcast=}

{=L:live.rec.video=}		 
Breite:{=L:live.rec.width=}: Höhe:{=L:live.rec.height=}:
Codec:{=L:live.rec.codec=}: Bitrate:{=L:live.rec.bitrate=}:
Scale:{=L:live.rec.scale=}:    

Audio		 

{=L:live.rec.audio=}		 
Codec:{=L:live.rec.codec=}: Bitrate:{=L:live.rec.bitrate=}:
Channels:{=L:live.rec.channels=}:    

Access		 

{=L:live.rec.access=}		 
Type:{=L:live.rec.type=}:
IP:Port:{=L:live.rec.ip_port=}:

- Display on + {=L:live.rec.display_on=}  
- + - + - - + + - + - - + + - - + +

VLC Settings (IE & Mozilla >= 0.8.6.1)

{=L:live.set.vlc_settings=}
Deinterlace{=L:live.set.deinterlace=} - AUS  - AN + {=L:off=}  + {=L:on=}
http caching{=L:live.set.http_caching=}
UDP as default{=L:live.set.udp_defaul=} - AUS  - AN + {=L:off=}  + {=L:on=}
Slave Box IP (2. dbox){=L:live.set.slavebox_ip=}
VLC Aufnahmepfad{=L:live.set.vlc_rec_dir=}