mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 16:01:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

yweb: 2.8.0.0 Release

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@483 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
yjogol
2010-03-14 07:55:42 +00:00
parent a7187da658
commit 9dff920fb8
15 changed files with 194 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

124
src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
View File

@@ -606,52 +606,52 @@ struct key {
#endif #endif
static const struct key keynames[] = { static const struct key keynames[] = {
{"KEY_POWER", KEY_POWER}, {"KEY_POWER", KEY_POWER},
{"KEY_MUTE", KEY_MUTE}, {"KEY_MUTE", KEY_MUTE},
{"KEY_1", KEY_1}, {"KEY_1", KEY_1},
{"KEY_2", KEY_2}, {"KEY_2", KEY_2},
{"KEY_3", KEY_3}, {"KEY_3", KEY_3},
{"KEY_4", KEY_4}, {"KEY_4", KEY_4},
{"KEY_5", KEY_5}, {"KEY_5", KEY_5},
{"KEY_6", KEY_6}, {"KEY_6", KEY_6},
{"KEY_7", KEY_7}, {"KEY_7", KEY_7},
{"KEY_8", KEY_8}, {"KEY_8", KEY_8},
{"KEY_9", KEY_9}, {"KEY_9", KEY_9},
{"KEY_0", KEY_0}, {"KEY_0", KEY_0},
{"KEY_INFO", KEY_INFO}, {"KEY_INFO", KEY_INFO},
{"KEY_MODE", KEY_MODE}, {"KEY_MODE", KEY_MODE},
{"KEY_SETUP", KEY_MENU}, {"KEY_SETUP", KEY_MENU},
{"KEY_EPG", KEY_EPG}, {"KEY_EPG", KEY_EPG},
{"KEY_FAVORITES", KEY_FAVORITES}, {"KEY_FAVORITES", KEY_FAVORITES},
{"KEY_HOME", KEY_EXIT}, {"KEY_HOME", KEY_EXIT},
{"KEY_UP", KEY_UP}, {"KEY_UP", KEY_UP},
{"KEY_LEFT", KEY_LEFT}, {"KEY_LEFT", KEY_LEFT},
{"KEY_OK", KEY_OK}, {"KEY_OK", KEY_OK},
{"KEY_RIGHT", KEY_RIGHT}, {"KEY_RIGHT", KEY_RIGHT},
{"KEY_DOWN", KEY_DOWN}, {"KEY_DOWN", KEY_DOWN},
{"KEY_VOLUMEUP", KEY_VOLUMEUP}, {"KEY_VOLUMEUP", KEY_VOLUMEUP},
{"KEY_VOLUMEDOWN", KEY_VOLUMEDOWN}, {"KEY_VOLUMEDOWN", KEY_VOLUMEDOWN},
{"KEY_PAGEUP", KEY_PAGEUP}, {"KEY_PAGEUP", KEY_PAGEUP},
{"KEY_PAGEDOWN", KEY_PAGEDOWN}, {"KEY_PAGEDOWN", KEY_PAGEDOWN},
{"KEY_TV", KEY_TV}, {"KEY_TV", KEY_TV},
{"KEY_TEXT", KEY_TEXT}, {"KEY_TEXT", KEY_TEXT},
{"KEY_RADIO", KEY_RADIO}, {"KEY_RADIO", KEY_RADIO},
{"KEY_RED", KEY_RED}, {"KEY_RED", KEY_RED},
{"KEY_GREEN", KEY_GREEN}, {"KEY_GREEN", KEY_GREEN},
{"KEY_YELLOW", KEY_YELLOW}, {"KEY_YELLOW", KEY_YELLOW},
{"KEY_BLUE", KEY_BLUE}, {"KEY_BLUE", KEY_BLUE},
{"KEY_SAT", KEY_SAT}, {"KEY_SAT", KEY_SAT},
{"KEY_HELP", KEY_HELP}, {"KEY_HELP", KEY_HELP},
{"KEY_NEXT", KEY_NEXT}, {"KEY_NEXT", KEY_NEXT},
{"KEY_PREVIOUS", KEY_PREVIOUS}, {"KEY_PREVIOUS", KEY_PREVIOUS},
{"KEY_TIME", KEY_TIME}, {"KEY_TIME", KEY_TIME},
{"KEY_AUDIO", KEY_AUDIO}, {"KEY_AUDIO", KEY_AUDIO},
{"KEY_REWIND", KEY_REWIND}, {"KEY_REWIND", KEY_REWIND},
{"KEY_FORWARD", KEY_FORWARD}, {"KEY_FORWARD", KEY_FORWARD},
{"KEY_PAUSE", KEY_PAUSE}, {"KEY_PAUSE", KEY_PAUSE},
{"KEY_RECORD", KEY_RECORD}, {"KEY_RECORD", KEY_RECORD},
{"KEY_STOP", KEY_STOP}, {"KEY_STOP", KEY_STOP},
{"KEY_PLAY", KEY_PLAY} {"KEY_PLAY", KEY_PLAY}
}; };
// The code here is based on rcsim. Thx Carjay! // The code here is based on rcsim. Thx Carjay!
@@ -792,7 +792,6 @@ void CControlAPI::CryptCGI(CyhookHandler *hh)
//TODO: more //TODO: more
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void CControlAPI::ChannellistCGI(CyhookHandler *hh) void CControlAPI::ChannellistCGI(CyhookHandler *hh)
{ {
@@ -1177,7 +1176,6 @@ void CControlAPI::StartPluginCGI(CyhookHandler *hh)
} }
else else
hh->SendError(); hh->SendError();
} }
else else
hh->SendError(); hh->SendError();
@@ -1220,26 +1218,10 @@ void CControlAPI::SendChannelList(CyhookHandler *hh)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void CControlAPI::SendStreamInfo(CyhookHandler *hh) void CControlAPI::SendStreamInfo(CyhookHandler *hh)
{ {
hh->WriteLn(NeutrinoAPI->getVideoResolutionAsString());
int bitInfo[10]; hh->WriteLn(NeutrinoAPI->getVideoAspectRatioAsString());
NeutrinoAPI->GetStreamInfo(bitInfo); hh->WriteLn(NeutrinoAPI->getVideoFramerateAsString());
hh->printf("%d\n%d\n", bitInfo[0], bitInfo[1] ); //Resolution x y hh->WriteLn(NeutrinoAPI->getAudioInfoAsString());
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]]);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -1629,7 +1611,6 @@ void CControlAPI::doNewTimer(CyhookHandler *hh)
if(((int)rep) >= ((int)CTimerd::TIMERREPEAT_WEEKDAYS) && hh->ParamList["wd"] != "") if(((int)rep) >= ((int)CTimerd::TIMERREPEAT_WEEKDAYS) && hh->ParamList["wd"] != "")
NeutrinoAPI->Timerd->getWeekdaysFromStr(&rep, hh->ParamList["wd"].c_str()); NeutrinoAPI->Timerd->getWeekdaysFromStr(&rep, hh->ParamList["wd"].c_str());
#if 0 //FIXME
// apids // apids
bool changeApids=false; bool changeApids=false;
unsigned char apids=0; unsigned char apids=0;
@@ -1656,7 +1637,6 @@ void CControlAPI::doNewTimer(CyhookHandler *hh)
apids |= TIMERD_APIDS_AC3; apids |= TIMERD_APIDS_AC3;
} }
} }
#endif
CTimerd::RecordingInfo recinfo; CTimerd::RecordingInfo recinfo;
CTimerd::EventInfo eventinfo; CTimerd::EventInfo eventinfo;
eventinfo.epgID = 0; eventinfo.epgID = 0;
@@ -1693,10 +1673,8 @@ void CControlAPI::doNewTimer(CyhookHandler *hh)
_rec_dir = Config->getString("network_nfs_recordingdir", "/mnt/filme"); _rec_dir = Config->getString("network_nfs_recordingdir", "/mnt/filme");
delete Config;//Memory leak: Config delete Config;//Memory leak: Config
} }
#if 0 //FIXME?
if(changeApids) if(changeApids)
eventinfo.apids = apids; eventinfo.apids = apids;
#endif
recinfo = eventinfo; recinfo = eventinfo;
strncpy(recinfo.recordingDir, _rec_dir.c_str(), RECORD_DIR_MAXLEN-1); strncpy(recinfo.recordingDir, _rec_dir.c_str(), RECORD_DIR_MAXLEN-1);
data = &recinfo; data = &recinfo;
@@ -1930,7 +1908,7 @@ void CControlAPI::build_live_url(CyhookHandler *hh)
//url += (mode == CZapitClient::MODE_TV) ? ":31339/0," : ":31338/"; //url += (mode == CZapitClient::MODE_TV) ? ":31339/0," : ":31338/";
url += ":31339/0,"; url += ":31339/0,";
url += xpids; url += xpids;
printf("Live url: %s\n", url.c_str());
// response url // response url
if(hh->ParamList["vlc_link"] !="") if(hh->ParamList["vlc_link"] !="")
{ {

7
src/nhttpd/web/Y_Blocks.txt
View File

@@ -445,13 +445,6 @@ start-block~frame_live_directtv
{=include-block:Y_Blocks.txt;frame_secondary=} {=include-block:Y_Blocks.txt;frame_secondary=}
end-block~frame_live_directtv 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 # ------- Lay-Frame Tools-Menu
start-block~frame_tools start-block~frame_tools
{=var-set:sec_menu=Y_Tools_Menue.yhtm=} {=var-set:sec_menu=Y_Tools_Menue.yhtm=}

2
src/nhttpd/web/Y_Boxcontrol_Bouquetlist.yhtm
View File

@@ -3,7 +3,7 @@
</head> </head>
<body> <body>
<table class="bouquetlist" width="100%"> <table class="bouquetlist" width="100%">
<tr class="blist"><td><a href="Y_Boxcontrol_Channellist.yhtm#akt" target="content">Channels</a></td></tr> <tr class="blist"><td><a href="Y_Boxcontrol_Channellist.yhtm#akt" target="content">{=L:bc.channels=}</a></td></tr>
<tr><td><hr/></td></tr> <tr><td><hr/></td></tr>
{=func:get_bouquets_as_templatelist <tr class="blist"><td><a href="Y_Boxcontrol_Channellist.yhtm?bouquet=%d#akt" target="content">%s</a></td></tr>=} {=func:get_bouquets_as_templatelist <tr class="blist"><td><a href="Y_Boxcontrol_Channellist.yhtm?bouquet=%d#akt" target="content">%s</a></td></tr>=}
</table> </table>

7
src/nhttpd/web/Y_Ext_Update_refresh.yhtm
View File

@@ -4,8 +4,7 @@
<script type="text/javascript" src="/Y_yweb.js"></script> <script type="text/javascript" src="/Y_yweb.js"></script>
<script type="text/javascript"> <script type="text/javascript">
//<![CDATA[ //<![CDATA[
function do_onload() function do_onload() {
{
yhttpd_cache_clear(''); yhttpd_cache_clear('');
ext.read_items(); ext.read_items();
parent.sec_menu.location.reload(); parent.sec_menu.location.reload();
@@ -17,9 +16,9 @@ function do_onload()
{=var-set:wait_text={=L:refreshing=}=}{=include-block:Y_Blocks.txt;snip_wait=} {=var-set:wait_text={=L:refreshing=}=}{=include-block:Y_Blocks.txt;snip_wait=}
<div class="work_box"> <div class="work_box">
<div class="work_box_head"><div class="work_box_head_h2"> <div class="work_box_head"><div class="work_box_head_h2">
{=var-set:help_url=Help-Extensions-Update=}{=var-set:menu=Extensions Settings saved=}{=include-block:Y_Blocks.txt;work_menu=}</div></div> {=var-set:help_url=Help-Extensions-Update=}{=var-set:menu={=L:ext.ext_saved=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
<div class="work_box_body" width="100%s"> <div class="work_box_body" width="100%s">
Settings saved. Refreshing Menue now. {=L:ext.refresh_now=}
</div> </div>
</div> </div>
</body> </body>

6
src/nhttpd/web/Y_Live_Msg.yhtm
View File

@@ -4,10 +4,10 @@
<body> <body>
<div class="work_box"> <div class="work_box">
<div class="work_box_head"><div class="work_box_head_h2"> <div class="work_box_head"><div class="work_box_head_h2">
{=var-set:help_url=Help-Live_Timer-LiveView=}{=var-set:menu=LiveView PopUp=}{=include-block:Y_Blocks.txt;work_menu=}</div></div> {=var-set:help_url=Help-Live_Timer-LiveView=}{=var-set:menu={=L:live.tv_popup_desc=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
<div class="work_box_body"> <div class="work_box_body">
Under Live-View do not zap channels direct by the web or by the dbox' RC.<br/> {=L:live.live_popup_msg=}<br/>
<a href="Javascript:live_unlock();"><u>unlock</u></a> <a href="Javascript:live_unlock();"><u>{=L:live.unlock=}</u></a>
</div> </div>
</div> </div>
</body> </body>

36
src/nhttpd/web/Y_Live_Record.yhtm
View File

@@ -145,7 +145,7 @@ function doRecord()
_live.do_play(); _live.do_play();
} }
isRecord=!isRecord; isRecord=!isRecord;
$('record').update( (isRecord)? "Stop Record": "Record"); $('record').update( (isRecord)? "{=L:live.rec.stop_record=}": "{=L:live.rec.record=}");
} }
//]]> //]]>
</script> </script>
@@ -153,27 +153,27 @@ function doRecord()
<body> <body>
<form id="v" class="y_form" action="" method="get"> <form id="v" class="y_form" action="" method="get">
<table cellspacing="0" width="100%"> <table cellspacing="0" width="100%">
<tr><td class="y_form_header" colspan="4">Record Mode</td></tr> <tr><td class="y_form_header" colspan="4">{=L:live.rec.record_mode=}</td></tr>
<tr> <tr>
<td>Filename:</td> <td>{=L:live.rec.filename=}:</td>
<td colspan="3"><input type="text" id="record_filename" value="{=ini-get:/var/tuxbox/config/Y-Web.conf;vlc_record_path=}"/></td> <td colspan="3"><input type="text" id="record_filename" value="{=ini-get:/var/tuxbox/config/Y-Web.conf;vlc_record_path=}"/></td>
</tr> </tr>
<tr> <tr>
<td colspan="4"> <td colspan="4">
<input type="checkbox" id="tdisplay" value="1" title="Display on while transcoding" checked="checked"/>Display on&nbsp; <input type="checkbox" id="tdisplay" value="1" title="Display on while transcoding" checked="checked"/>{=L:live.rec.display_on=}&nbsp;
<input type="checkbox" id="transon" value="1" title="use transcoding" onclick="on_transon_change()"/>Transcoding on <input type="checkbox" id="transon" value="1" title="use transcoding" onclick="on_transon_change()"/>{=L:live.rec.transcoding_on=}
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="4"> <td colspan="4">
<br/> <br/>
<button class="y_live_button" type="button" value="Record" title="record stream to file" onclick="doRecord()"> <button class="y_live_button" type="button" value="Record" title="record stream to file" onclick="doRecord()">
<img src="/images/record.png"/>&nbsp;<span id="record">Record</span></button> <img src="/images/record.png"/>&nbsp;<span id="record">{=L:live.rec.record=}</span></button>
</td> </td>
</tr> </tr>
<tr><td class="y_form_header" colspan="4"><br/>Record Transcode</td></tr> <tr><td class="y_form_header" colspan="4"><br/>{=L:live.rec.tanscode=}</td></tr>
<tr> <tr>
<td>Profile:</td> <td>{=L:live.rec.profile=}:</td>
<td colspan="3"> <td colspan="3">
<select id="profile" class="y_live_button" onchange="on_profile_change()"> <select id="profile" class="y_live_button" onchange="on_profile_change()">
{=if-equal:{=mode=}~tv~ {=if-equal:{=mode=}~tv~
@@ -187,15 +187,15 @@ function doRecord()
</td> </td>
</tr> </tr>
{=if-equal:{=mode=}~tv~ {=if-equal:{=mode=}~tv~
<tr><td class="y_form_section"><br/>Video</td><td class="y_form_section" colspan="3">&nbsp;</td></tr> <tr><td class="y_form_section"><br/>{=L:live.rec.video=}</td><td class="y_form_section" colspan="3">&nbsp;</td></tr>
<tr> <tr>
<td>Breite:</td> <td>{=L:live.rec.width=}:</td>
<td><input type="text" id="twidth" size="4" value="720" class="y_live_button"/></td> <td><input type="text" id="twidth" size="4" value="720" class="y_live_button"/></td>
<td>H&ouml;he:</td> <td>{=L:live.rec.height=}:</td>
<td><input type="text" id="theight" size="4" value="576" class="y_live_button"/></td> <td><input type="text" id="theight" size="4" value="576" class="y_live_button"/></td>
</tr> </tr>
<tr> <tr>
<td>Codec:</td> <td>{=L:live.rec.codec=}:</td>
<td> <td>
<select id="vcodec" class="y_live_button"> <select id="vcodec" class="y_live_button">
<option value="mp4v" selected="selected">mp4v</option> <option value="mp4v" selected="selected">mp4v</option>
@@ -209,7 +209,7 @@ function doRecord()
<option value="WMV1">WMV2</option> <option value="WMV1">WMV2</option>
</select> </select>
</td> </td>
<td>Bitrate:</td> <td>{=L:live.rec.bitrate=}:</td>
<td> <td>
<select id="vb" class="y_live_button"> <select id="vb" class="y_live_button">
<option value="1024">1024</option> <option value="1024">1024</option>
@@ -224,7 +224,7 @@ function doRecord()
</td> </td>
</tr> </tr>
<tr> <tr>
<td>Scale:</td> <td>{=L:live.rec.scale=}:</td>
<td> <td>
<select id="scale" class="y_live_button"> <select id="scale" class="y_live_button">
<option value="0.25">0.25</option> <option value="0.25">0.25</option>
@@ -241,9 +241,9 @@ function doRecord()
<td>&nbsp;</td> <td>&nbsp;</td>
</tr> </tr>
=} =}
<tr><td class="y_form_section">Audio</td><td class="y_form_section" colspan="3">&nbsp;</td></tr> <tr><td class="y_form_section">{=L:live.rec.audio=}</td><td class="y_form_section" colspan="3">&nbsp;</td></tr>
<tr> <tr>
<td>Codec:</td> <td>{=L:live.rec.codec=}:</td>
<td> <td>
<select id="acodec" class="y_live_button"> <select id="acodec" class="y_live_button">
<option value="mp4a" selected="selected">mp4a</option> <option value="mp4a" selected="selected">mp4a</option>
@@ -255,7 +255,7 @@ function doRecord()
<option value="fl32">fl32</option> <option value="fl32">fl32</option>
</select> </select>
</td> </td>
<td>Bitrate:</td> <td>{=L:live.rec.bitrate=}:</td>
<td> <td>
<select id="ab" class="y_live_button"> <select id="ab" class="y_live_button">
<option value="192">192</option> <option value="192">192</option>
@@ -268,7 +268,7 @@ function doRecord()
</td> </td>
</tr> </tr>
<tr> <tr>
<td>Channels:</td> <td>{=L:live.rec.channels=}:</td>
<td> <td>
<select id="channels" class="y_live_button"> <select id="channels" class="y_live_button">
<option value="1">1</option> <option value="1">1</option>

30
src/nhttpd/web/Y_Live_Transcode.yhtm
View File

@@ -43,16 +43,16 @@ function doTranscode()
<body> <body>
<form class="y_form" name="v" action="" method="get"> <form class="y_form" name="v" action="" method="get">
<table cellspacing="0"> <table cellspacing="0">
<tr><td class="y_form_header" colspan="5">Transcode-Broadcast</td></tr> <tr><td class="y_form_header" colspan="5">{=L:live.rec.trans_broadcast=}</td></tr>
<tr><td class="y_form_section"><br/>Video</td><td class="y_form_section" colspan="3">&nbsp;</td></tr> <tr><td class="y_form_section"><br/>{=L:live.rec.video=}</td><td class="y_form_section" colspan="3">&nbsp;</td></tr>
<tr> <tr>
<td>Breite:</td> <td>{=L:live.rec.width=}:</td>
<td><input type="text" name="twidth" size="4" value="384" class="y_live_button"/></td> <td><input type="text" name="twidth" size="4" value="384" class="y_live_button"/></td>
<td>H&ouml;he:</td> <td>{=L:live.rec.height=}:</td>
<td><input type="text" name="theight" size="4" value="288" class="y_live_button"/></td> <td><input type="text" name="theight" size="4" value="288" class="y_live_button"/></td>
</tr> </tr>
<tr> <tr>
<td>Codec:</td> <td>{=L:live.rec.codec=}:</td>
<td> <td>
<select name="vcodec" class="y_live_button"> <select name="vcodec" class="y_live_button">
<option value="mp4v" selected="selected">mp4v</option> <option value="mp4v" selected="selected">mp4v</option>
@@ -66,7 +66,7 @@ function doTranscode()
<option value="WMV1">WMV2</option> <option value="WMV1">WMV2</option>
</select> </select>
</td> </td>
<td>Bitrate:</td> <td>{=L:live.rec.bitrate=}:</td>
<td> <td>
<select name="vb" class="y_live_button"> <select name="vb" class="y_live_button">
<option value="1024">1024</option> <option value="1024">1024</option>
@@ -81,7 +81,7 @@ function doTranscode()
</td> </td>
</tr> </tr>
<tr> <tr>
<td>Scale:</td> <td>{=L:live.rec.scale=}:</td>
<td> <td>
<select name="scale" class="y_live_button"> <select name="scale" class="y_live_button">
<option value="0.25">0.25</option> <option value="0.25">0.25</option>
@@ -97,9 +97,9 @@ function doTranscode()
<td>&nbsp;</td> <td>&nbsp;</td>
<td>&nbsp;</td> <td>&nbsp;</td>
</tr> </tr>
<tr><td class="y_form_section"><br/>Audio</td><td class="y_form_section" colspan="3">&nbsp;</td></tr> <tr><td class="y_form_section"><br/>{=L:live.rec.audio=}</td><td class="y_form_section" colspan="3">&nbsp;</td></tr>
<tr> <tr>
<td>Codec:</td> <td>{=L:live.rec.codec=}:</td>
<td> <td>
<select name="acodec" class="y_live_button"> <select name="acodec" class="y_live_button">
<option value="mp4a" selected="selected">mp4a</option> <option value="mp4a" selected="selected">mp4a</option>
@@ -111,7 +111,7 @@ function doTranscode()
<option value="fl32">fl32</option> <option value="fl32">fl32</option>
</select> </select>
</td> </td>
<td>Bitrate:</td> <td>{=L:live.rec.bitrate=}:</td>
<td> <td>
<select name="ab" class="y_live_button"> <select name="ab" class="y_live_button">
<option value="192">192</option> <option value="192">192</option>
@@ -124,7 +124,7 @@ function doTranscode()
</td> </td>
</tr> </tr>
<tr> <tr>
<td>Channels:</td> <td>{=L:live.rec.channels=}:</td>
<td> <td>
<select name="channels" class="y_live_button"> <select name="channels" class="y_live_button">
<option value="1">1</option> <option value="1">1</option>
@@ -135,9 +135,9 @@ function doTranscode()
<td>&nbsp;</td> <td>&nbsp;</td>
<td>&nbsp;</td> <td>&nbsp;</td>
</tr> </tr>
<tr><td class="y_form_section"><br/>Access</td><td class="y_form_section" colspan="3">&nbsp;</td></tr> <tr><td class="y_form_section"><br/>{=L:live.rec.access=}</td><td class="y_form_section" colspan="3">&nbsp;</td></tr>
<tr> <tr>
<td>Type:</td> <td>{=L:live.rec.type=}:</td>
<td> <td>
<select name="access" class="y_live_button"> <select name="access" class="y_live_button">
<option value="udp" selected="selected">udp</option> <option value="udp" selected="selected">udp</option>
@@ -160,7 +160,7 @@ function doTranscode()
</td> </td>
</tr> </tr>
<tr> <tr>
<td>IP:Port:</td> <td>{=L:live.rec.ip_port=}:</td>
<td colspan="3"> <td colspan="3">
<input type="text" name="tip" size="18" value="localhost:1234" class="y_live_button"/> <input type="text" name="tip" size="18" value="localhost:1234" class="y_live_button"/>
</td> </td>
@@ -168,7 +168,7 @@ function doTranscode()
<tr> <tr>
<td colspan="3"> <td colspan="3">
<br/> <br/>
<input type="checkbox" name="tdisplay" value="1" title="Display on while transcoding" checked="checked"/>Display on <input type="checkbox" name="tdisplay" value="1" title="Display on while transcoding" checked="checked"/>{=L:live.rec.display_on=}
&nbsp;<button class="y_live_button" type="button" value="transcode" title="transcode stream" name="transcode" onclick="doTranscode()"><img src="/images/transcode.png"/>&nbsp;Transcode</button> &nbsp;<button class="y_live_button" type="button" value="transcode" title="transcode stream" name="transcode" onclick="doTranscode()"><img src="/images/transcode.png"/>&nbsp;Transcode</button>
</td> </td>
</tr> </tr>

30
src/nhttpd/web/Y_Settings_Live.yhtm
View File

@@ -14,32 +14,32 @@ function do_refresh_liveview()
{=var-set:wait_text={=L:save_values=}=}{=include-block:Y_Blocks.txt;snip_wait=} {=var-set:wait_text={=L:save_values=}=}{=include-block:Y_Blocks.txt;snip_wait=}
<form class="y_form" name="f" action="/y/cgi"> <form class="y_form" name="f" action="/y/cgi">
<table border="0" cellspacing="0"> <table border="0" cellspacing="0">
<tr><td class="y_form_header" colspan="2"><br/>VLC Settings (IE &amp; Mozilla >= 0.8.6.1)</td></tr> <tr><td class="y_form_header" colspan="2"><br/>{=L:live.set.vlc_settings=}</td></tr>
<tr> <tr>
<td>Deinterlace</td> <td>{=L:live.set.deinterlace=}</td>
<td> <td>
<input type="radio" name="deinterlace" value="false" title="deinterlace: off"/>AUS&nbsp; <input type="radio" name="deinterlace" value="false"/>{=L:off=}&nbsp;
<input type="radio" name="deinterlace" value="true" title="deinterlace: on"/>AN <input type="radio" name="deinterlace" value="true"/>{=L:on=}
</td> </td>
</tr> </tr>
<tr> <tr>
<td>http caching</td> <td>{=L:live.set.http_caching=}</td>
<td><input type="text" name="http_caching" size="5" value="{=ini-get:/var/tuxbox/config/Y-Web.conf;http_caching;1000=}" title="http caching. 0=off"/></td> <td><input type="text" name="http_caching" size="5" value="{=ini-get:/var/tuxbox/config/Y-Web.conf;http_caching;1000=}"/></td>
</tr> </tr>
<tr> <tr>
<td>UDP as default</td> <td>{=L:live.set.udp_defaul=}</td>
<td> <td>
<input type="radio" name="udp" value="false" title="udp: off"/>AUS&nbsp; <input type="radio" name="udp" value="false"/>{=L:off=}&nbsp;
<input type="radio" name="udp" value="true" title="udp: on"/>AN <input type="radio" name="udp" value="true"/>{=L:on=}
</td> </td>
</tr> </tr>
<tr> <tr>
<td>Slave Box IP (2. dbox)</td> <td>{=L:live.set.slavebox_ip=}</td>
<td><input type="text" name="slavebox" size="15" value="{=ini-get:/var/tuxbox/config/Y-Web.conf;slavebox=}" title="enter IP (xxx.xxx.xxx.xxx) of slave-box"/></td> <td><input type="text" name="slavebox" size="15" value="{=ini-get:/var/tuxbox/config/Y-Web.conf;slavebox=}" title="{=L:live.set.enter_ip=}"/></td>
</tr> </tr>
<tr> <tr>
<td>VLC Aufnahmepfad</td> <td>{=L:live.set.vlc_rec_dir=}</td>
<td><input type="text" name="vlc_record_path" size="17" value="{=ini-get:/var/tuxbox/config/Y-Web.conf;vlc_record_path=}" title="VLC record path for LiveView direct recording."/></td> <td><input type="text" name="vlc_record_path" size="17" value="{=ini-get:/var/tuxbox/config/Y-Web.conf;vlc_record_path=}"/></td>
</tr> </tr>
<!--- <tr> <!--- <tr>
<td>VLC Aufnahmetyp</td> <td>VLC Aufnahmetyp</td>
@@ -50,8 +50,8 @@ function do_refresh_liveview()
<br/> <br/>
<input type="hidden" name="tmpl" value="Y_Settings_Live.yhtm"/> <input type="hidden" name="tmpl" value="Y_Settings_Live.yhtm"/>
<input type="hidden" name="execute" value="include-block:Y_Blocks.txt;Live_save_settings;nix"/> <input type="hidden" name="execute" value="include-block:Y_Blocks.txt;Live_save_settings;nix"/>
<button type="button" ytype="save" title="submit and save values" onclick="do_submit()">Speichern</button> <button type="button" ytype="save" title="{=L:save_values_desc=}" onclick="do_submit()">{=L:save=}</button>
<button type="button" ytype="refresh" title="Refresh LiveView" onclick="do_refresh_liveview()">Refresh LiveView</button> <button type="button" ytype="refresh" onclick="do_refresh_liveview()">{=L:live.set.refresh_liveview=}</button>
</form> </form>
<script type="text/javascript"> <script type="text/javascript">
//<![CDATA[ //<![CDATA[

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

@@ -12,10 +12,10 @@ function form_init()
function do_submit() function do_submit()
{ {
if(document.f.authpassword.value.length < 5) if(document.f.authpassword.value.length < 5)
alert("Passwort muss mind. 4 Zeichen haben"); alert("{=L:set.nhttpd.check_password=}");
else else
if(document.f.port.value == "") if(document.f.port.value == "")
alert("Port muss angegeben werden"); alert("{=L:set.nhttpd.check_port=}");
else{ else{
show_waitbox(true); show_waitbox(true);
yhttpd_cache_clear(""); yhttpd_cache_clear("");

24
src/nhttpd/web/Y_Timer_Menue.yhtm
View File

@@ -1,24 +0,0 @@
{=include-block:Y_Blocks.txt;head=}
</head>
{=var-set:management={=if-equal:{=func:get_request_data client_addr=}~{=ini-get:/var/tuxbox/config/Y-Web.conf;management_ip;{=func:get_request_data client_addr=}=}~1~=}{=if-equal:{=func:get_request_data client_addr=}~{=ini-get:/var/tuxbox/config/Y-Web.conf;management_ip2=}~1~=}=}
<body>
<div class="y_menu_sec_box">
<div class="y_menu_sec_box_head"><h2>Timer</h2></div>
<div class="y_menu_sec_box_body">
<div class="y_menu_sec">
<ul id="menu_sec">
<li><a target="work" title="organize timer" href="/fb/timer.dbox2">Timer</a></li>
<li><a target="work" title="sync timer with web tv planer" href="Y_Tools_Timer_Sync.yhtm">Sync Timer</a></li>
<li><a target="work" title="recorder" href="Y_Blank.yhtm">Recorder</a></li>
{=if-empty:{=var-get:management=}~
<li class="disabled" title="SyncTimer Settings (restricted by ManagementIP)">Timer Settings</a></li>
~
<li><a title="SyncTimer Settings" target="work" href="Y_Settings_Timer.yhtm">Timer Settings</a></li>
=}
</ul>
</div>
</div>
</div>
</body>
</html>

125
src/nhttpd/web/Y_Tools_NetStream.yhtm
View File

@@ -1,125 +0,0 @@
{=include-block:Y_Blocks.txt;head=}
<script type="text/javascript" src="/Y_Baselib.js"></script>
<script type="text/javascript">
//<![CDATA[
function do_stop()
{
document.vlc.stop()
}
function doPlayOrPause()
{
if( document.vlc.{=if-equal:{=browser=}~ie~playing~isplaying()=} )
{
document.v.PlayOrPause.value = " Play ";
document.vlc.pause()
} else {
document.v.PlayOrPause.value = "Pause";
document.vlc.play()
}
}
function doStop()
{
document.v.PlayOrPause.value = " Play ";
document.vlc.stop()
}
function doLockUnlock()
{
if( document.v.lock.value == "Lock" )
{
document.v.lock.value = "Unlock";
live_lock();
} else {
document.v.lock.value = "Lock";
live_unlock();
}
}
function doGo()
{
var targetURL= document.v.targetTextField.value;
{=if-equal:{=browser=}~ie~
var options = new Array(":input-repeat=1");
document.vlc.addTarget(targetURL, options, 4+8, -666);
~
document.vlc.add_item(targetURL);
document.vlc.next()
document.vlc.play()
=}
};
//]]>
</script>
</head>
<body>
<div class="work_box">
<div class="work_box_head"><div class="work_box_head_h2">
{=var-set:help_url=Neutrino:yWeb:Live_Timer#NetStream=}{=var-set:menu=Net Stream=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
<div class="work_box_body">
<font size="1">&nbsp;&nbsp;&nbsp; VLC Plugin Test</font>
<form name="v" action="">
<table border="0" cellspacing="0" cellpadding="0">
<tr>
<td>
MRL:
<input size="47" name="targetTextField" value="http://www.nasa.gov/55644main_NASATV_Windows.asx"/>
<input type="button" value="Go" title="start streaming the given MRL (Media-URL). Please wait..." onclick="doGo();"/>
</td>
</tr>
<tr>
<td>
{=if-equal:{=browser=}~ie~
<OBJECT classid="clsid:E23FE9C6-778E-49D4-B537-38FCDE4887D8"
width="384" height="288" id="vlc" events="True">
<param name="Src" value="" />
<param name="ShowDisplay" value="True" />
<param name="Loop" value="False" />
<param name="AutoPlay" value="false" />
The VideoLan Client ActiveX is not installed.<br/>
You need <a href="http://www.videolan.org" target="_blank">VideoLan Client</a> V0.8.2 or higher.<br/>
Install with Option "ActiveX".
</OBJECT>
</td>
</tr>
<tr>
<td>
<button class="y_live_button" type="button" value="Pause" title="play or pause streaming" id="PlayOrPause" onclick="doPlayOrPause()">Pause</button>
<button class="y_live_button" type="button" value="stop" title="stop streaming" onclick="doStop()">Stop</button>
<button class="y_live_button" type="button" value="mute" title="mute / unmute volume" onclick="document.vlc.toggleMute()">Mute</button>
<button class="y_live_button" type="button" value="fullscreen" title="switch to fullscreen-mode - or use double-click" onclick="document.vlc.fullscreen()">FScreen</button>
<button class="y_live_button" type="button" value="minus" title="lower volume" onclick="document.vlc.volume=document.vlc.volume-10;">-</button>
<button class="y_live_button" type="button" value="plus" title="higher volume" onccclick="document.vlc.volume = document.vlc.volume+10;">+</button>
<button class="y_live_button" type="button" value="Lock" title="lock / unlock TV (record mode, rc, lcd)" name="lock" onclick="doLockUnlock()">Lock</button>
~
<embed type="application/x-vlc-plugin"
name="vlc"
autoplay="no" loop="yes" width="384" height="288">
</embed>
</td>
</tr>
<tr>
<td>
<button class="y_live_button" type="button" value="stop" title="stop streaming" onclick="doStop()">Stop</button>
<button class="y_live_button" type="button" value="mute" title="mute / unmute volume" onclick="document.vlc.mute()">Mute</button>
<button class="y_live_button" type="button" value="fullscreen" title="switch to fullscreen-mode - or use double-click" onclick="document.vlc.fullscreen()">F</button>
<button class="y_live_button" type="button" value="minus" title="lower volume" onclick="document.vlc.set_volume(document.vlc.get_volume()-10);">-</button>
<button class="y_live_button" type="button" value="plus" title="higher volume" onclick="document.vlc.set_volume(document.vlc.get_volume()+10);">+</button>
<input class="y_live_button" type="button" value="Lock" title="lock / unlock TV (record mode, rc, lcd)" name="lock" onclick="doLockUnlock()"/>
=}
</td>
</tr>
</table>
</form>
</div>
</div>
<script type="text/javascript">
//<![CDATA[
var res_w=parseInt("{=ini-get:/var/tuxbox/config/Y-Web.conf;live_resolution_w;384=}",10);
var res_h=parseInt("{=ini-get:/var/tuxbox/config/Y-Web.conf;live_resolution_h;288=}",10);
if(isNaN(res_w)) res_w=384;
if(isNaN(res_h)) res_h=288;
document.vlc.width=res_w;
document.vlc.height=res_h;
//]]>
</script>
</body>
</html>

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

@@ -1,5 +1,5 @@
version=2.8.b.4 version=2.8.0.0
date=13.03.2010 date=14.03.2010
type=Beta type=Release
info=Port Coolstream info=Port Coolstream

41
src/nhttpd/web/languages/Deutsch
View File

@@ -126,6 +126,9 @@ bc.osd.shot=Schnappschuss
bc.osd.delete_shots=Schnappschuss löschen bc.osd.delete_shots=Schnappschuss löschen
bc.osd.shap_wait_text=Schnappschuss wird erstellt bc.osd.shap_wait_text=Schnappschuss wird erstellt
========= Boxcontrol - Others
bc.channels=Sender
====== EXtension ====== EXtension
ext.installer_updater=Installation ext.installer_updater=Installation
ext.uninstaller=Deinstallation Erweiterungen ext.uninstaller=Deinstallation Erweiterungen
@@ -147,6 +150,8 @@ ext.your=Deine
ext.update=Aktuelle ext.update=Aktuelle
ext.update_install=Aktualisierung / Installation ext.update_install=Aktualisierung / Installation
ext.site=Site ext.site=Site
ext.refresh_now=Einstellungen gespeichert. Menues werden aktualisiert.
ext.ext_saved=Erweiterungseinstellungen gespeichert
====== Bouquet ====== Bouquet
bou.bouquets_must_be_saved=Alle &Auml;nderungen m&uuml;ssen noch gespeichert werden! bou.bouquets_must_be_saved=Alle &Auml;nderungen m&uuml;ssen noch gespeichert werden!
@@ -306,6 +311,8 @@ set.nhttpd.cache=Cache
set.nhttpd.cache_info=Cache Informationen set.nhttpd.cache_info=Cache Informationen
set.nhttpd.clear_cache=Cache löschen set.nhttpd.clear_cache=Cache löschen
set.nhttpd.server_configuration=Server Konfiguration set.nhttpd.server_configuration=Server Konfiguration
set.nhttpd.check_password=Passwort muss mind. 4 Zeichen haben
set.nhttpd.check_port=Port muss angegeben werden
=========Settings yWeb =========Settings yWeb
set.yweb.enter_ip_desc=IP Adresse eingeben (xxx.xxx.xxx.xxx) set.yweb.enter_ip_desc=IP Adresse eingeben (xxx.xxx.xxx.xxx)
@@ -424,6 +431,40 @@ live.transcode=Transkodiermodus
live.build_vlc=... erstelle Live ... live.build_vlc=... erstelle Live ...
live.select_bouquet=Bouquet auswählen - Sender werden aktualisiert live.select_bouquet=Bouquet auswählen - Sender werden aktualisiert
live.select_channel=Sender wechseln - nutze zap live.select_channel=Sender wechseln - nutze zap
live.live_popup_msg=Während des LiveTVs keine Sender wechseln!
live.unlock=FB freigeben
=========== LIVE Record
live.rec.record_mode=Aufnahmemodus
live.rec.filename=Dateiname
live.rec.display_on=Bildschirm an
live.rec.transcoding_on=Transkodierung an
live.rec.record=Aufname
live.rec.stop_record=Aufnahme Stopp
live.rec.tanscode=Afnahme transkodiert
live.rec.profile=Profile
live.rec.video=Video
live.rec.width=Breite
live.rec.height=H&ouml;he
live.rec.codec=Codec
live.rec.bitrate=Bitrate
live.rec.scale=Skalierung
live.rec.audio=Audio
live.rec.channels=Sender
live.rec.trans_broadcast=Transkodierung als Broadcast
live.rec.access=Zugriff
live.rec.type=Typ
live.rec.ip_port=IP:Port
=========== LIVE Settings
live.set.vlc_settings=VLC Einstellungen (IE &amp; Mozilla >= 0.8.6.1)
live.set.deinterlace=Deinterlace
live.set.http_caching=http caching
live.set.udp_defaul=UDP als Standard
live.set.slavebox_ip=Slave Box IP (2. Box)
live.set.enter_ip=IP (xxx.xxx.xxx.xxx) der Slavebox eingeben
live.set.vlc_rec_dir=VLC Aufnahmepfad
live.set.refresh_liveview=LiveView aktualisieren
=========== LIVE Timer Edit =========== LIVE Timer Edit
live.timer_edit.timer=Timer live.timer_edit.timer=Timer

41
src/nhttpd/web/languages/English
View File

@@ -128,6 +128,9 @@ bc.osd.shot=Shot
bc.osd.delete_shots=Delete shots bc.osd.delete_shots=Delete shots
bc.osd.shap_wait_text=Take Snapshot bc.osd.shap_wait_text=Take Snapshot
========= Boxcontrol - Others
bc.channels=Channels
====== EXtension ====== EXtension
ext.installer_updater=Installer/Updater ext.installer_updater=Installer/Updater
ext.uninstaller=Extensions Uninstaller ext.uninstaller=Extensions Uninstaller
@@ -149,6 +152,8 @@ ext.your=Your
ext.update=Update ext.update=Update
ext.update_install=update/install ext.update_install=update/install
ext.site=Site ext.site=Site
ext.refresh_now=Settings saved. Refreshing Menue now.
ext.ext_saved=Extensions Settings saved
====== Bouquet ====== Bouquet
bou.bouquet=Bouquet bou.bouquet=Bouquet
@@ -309,6 +314,8 @@ set.nhttpd.cache=Cache
set.nhttpd.cache_info=Cache info set.nhttpd.cache_info=Cache info
set.nhttpd.clear_cache=clear cache set.nhttpd.clear_cache=clear cache
set.nhttpd.server_configuration=Server Configuration set.nhttpd.server_configuration=Server Configuration
set.nhttpd.check_password=Password must have 4 letters at minimum
set.nhttpd.check_port=Port is required
=========Settings yWeb =========Settings yWeb
set.yweb.enter_ip_desc=enter IP (xxx.xxx.xxx.xxx) set.yweb.enter_ip_desc=enter IP (xxx.xxx.xxx.xxx)
@@ -427,6 +434,40 @@ live.transcode=transcode mode
live.build_vlc=... build vlc control ... live.build_vlc=... build vlc control ...
live.select_bouquet=select bouquet - channels will be updated live.select_bouquet=select bouquet - channels will be updated
live.select_channel=select channel - use go to zap live.select_channel=select channel - use go to zap
live.live_popup_msg=Under Live-View do not zap channels direct by the web or by the box' RC.
live.unlock=unlock RC
=========== LIVE Record
live.rec.record_mode=Record Mode
live.rec.filename=Filename
live.rec.display_on=Display on
live.rec.transcoding_on=Transcoding on
live.rec.record=Record
live.rec.stop_record=Stop Record
live.rec.tanscode=Record Transcode
live.rec.profile=Profile
live.rec.video=Video
live.rec.width=Width
live.rec.height=Height
live.rec.codec=Codec
live.rec.bitrate=Bitrate
live.rec.scale=Scale
live.rec.audio=Audio
live.rec.channels=Channels
live.rec.trans_broadcast=Transcode-Broadcast
live.rec.access=Access
live.rec.type=Type
live.rec.ip_port=IP:Port
=========== LIVE Settings
live.set.vlc_settings=VLC Settings (IE &amp; Mozilla >= 0.8.6.1)
live.set.deinterlace=Deinterlace
live.set.http_caching=http caching
live.set.udp_defaul=UDP as default
live.set.slavebox_ip=Slave Box IP (2. dbox)
live.set.enter_ip=enter IP (xxx.xxx.xxx.xxx) of slave-box
live.set.vlc_rec_dir=VLC Recording Directory
live.set.refresh_liveview=Refresh LiveView
=========== LIVE Timer Edit =========== LIVE Timer Edit
live.timer_edit.timer=Timer live.timer_edit.timer=Timer

2
src/nhttpd/yconfig.h
View File

@@ -25,7 +25,7 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// General central Definitions <configure!> // General central Definitions <configure!>
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#define HTTPD_VERSION "3.2.4" // Webserver version (can be overloaded) #define HTTPD_VERSION "3.2.5" // Webserver version (can be overloaded)
#define YHTTPD_VERSION "1.3.1" // Webserver version (Version of yhttpd-core!) #define YHTTPD_VERSION "1.3.1" // Webserver version (Version of yhttpd-core!)
#define IADDR_LOCAL "127.0.0.1" // local IP #define IADDR_LOCAL "127.0.0.1" // local IP
#define HTTPD_NAME "yhttpd" // Webserver name (can be overloaded) #define HTTPD_NAME "yhttpd" // Webserver name (can be overloaded)