mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 08:21:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

yweb: new version number 2.8.b.4, nhttpd 3.2.4

Browse Source 
- add /control/crypt for crypto information
- add crypto information to streaminfo

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@482 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: a7187da658
Author: yjogol <yjogol2@online.de>
Date: 2010-03-13 (Sat, 13 Mar 2010)



------------------
This commit was generated by Migit
This commit is contained in:
yjogol
2010-03-13 10:10:47 +00:00
parent 4608256e08
commit 1df251dfbd
10 changed files with 44 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -176,6 +176,7 @@ const CControlAPI::TyCgiCall CControlAPI::yCgiCallList[]=
{"vcroutput", &CControlAPI::VCROutputCGI, "text/plain"},
{"scartmode", &CControlAPI::ScartModeCGI, "text/plain"},
{"audio", &CControlAPI::AudioCGI, "text/plain"},
{"crypt", &CControlAPI::CryptCGI, "text/plain"},
// timer
{"timer", &CControlAPI::TimerCGI, "text/plain"},
// bouquet editing
@@ -781,6 +782,17 @@ void CControlAPI::VolumeCGI(CyhookHandler *hh)
hh->SendError();
}
//-----------------------------------------------------------------------------
void CControlAPI::CryptCGI(CyhookHandler *hh)
{
if (hh->ParamList.empty() || hh->ParamList["1"] == "info") {
hh->printf("%s",(NeutrinoAPI->getCryptInfoAsString()).c_str());
return;
}
//TODO: more
}
//-----------------------------------------------------------------------------
void CControlAPI::ChannellistCGI(CyhookHandler *hh)
{

1
src/nhttpd/tuxboxapi/coolstream/controlapi.h
View File

@@ -84,6 +84,7 @@ private:
void VCROutputCGI(CyhookHandler *hh);
void ScartModeCGI(CyhookHandler *hh);
void AudioCGI(CyhookHandler *hh);
void CryptCGI(CyhookHandler *hh);
void setBouquetCGI(CyhookHandler *hh);
void saveBouquetCGI(CyhookHandler *hh);
void moveBouquetCGI(CyhookHandler *hh);

16
src/nhttpd/tuxboxapi/coolstream/neutrinoapi.cpp
View File

@@ -463,3 +463,19 @@ std::string CNeutrinoAPI::getAudioInfoAsString(void) {
return out.str();
}
//-------------------------------------------------------------------------
std::string CNeutrinoAPI::getCryptInfoAsString(void) {
extern int pmt_caids[4][11];
unsigned short i,j;
std::stringstream out;
std::string casys[11]={"Irdeto:","Betacrypt:","Seca:","Viaccess:","Nagra:","Conax: ","Cryptoworks:","Videoguard:","EBU:","XCrypt:","PowerVU:"};
for(i=0;i<4;i++){
for(j=0;j<11;j++){
if(pmt_caids[i][j]){
out << casys[j] << hex << pmt_caids[i][j]<< "\n";
}
}
}
return out.str();
}

1
src/nhttpd/tuxboxapi/coolstream/neutrinoapi.h
View File

@@ -75,6 +75,7 @@ class CNeutrinoAPI
std::string getVideoResolutionAsString(void);
std::string getVideoFramerateAsString(void);
std::string getAudioInfoAsString(void);
std::string getCryptInfoAsString(void);
public:
CNeutrinoAPI();
~CNeutrinoAPI(void);

1
src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp
View File

@@ -678,6 +678,7 @@ std::string CNeutrinoYParser::func_get_current_stream_info(CyhookHandler *hh, s
hh->ParamList["AspectRatio"] = NeutrinoAPI->getVideoAspectRatioAsString();
hh->ParamList["FPS"] = NeutrinoAPI->getVideoFramerateAsString();
hh->ParamList["AudioType"] = NeutrinoAPI->getAudioInfoAsString();
hh->ParamList["Crypt"] = NeutrinoAPI->getCryptInfoAsString();
return "";
}
//-------------------------------------------------------------------------

8
src/nhttpd/web/Y_StreamInfo.yhtm
View File

@@ -89,6 +89,14 @@
<td>&nbsp;</td>
<td class="set"> <div align="left">{=vtxtpid=}</div></td>
</tr>
<tr>
<td class="set" colspan="3">&nbsp;</td>
</tr>
<tr>
<td class="set"><b>{=L:epg.si.crypt=}:</b></td>
<td>&nbsp;</td>
<td class="set"> <div align="left">{=Crypt=}</div></td>
</tr>
</table>
</div>
</body>

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

@@ -1,5 +1,5 @@
version=2.8.b.3
date=07.03.2010
version=2.8.b.4
date=13.03.2010
type=Beta
info=Port Coolstream

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

@@ -189,6 +189,7 @@ epg.si.tsid=Transponder Stream ID
epg.si.vpid=Video PID
epg.si.apid=Audio PID
epg.si.vtxtpid=Teletext PID
epg.si.crypt=Crypt Systeme
========Neutrino Settings
set.reload_neutrino=Neutrino neuladen

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

@@ -192,6 +192,7 @@ epg.si.tsid=Transponder Stream ID
epg.si.vpid=Video PID
epg.si.apid=Audio PID
epg.si.vtxtpid=Teletext PID
epg.si.crypt=Crypt systems
========Settings
set.reload_neutrino=reload Neutrino

2
src/nhttpd/yconfig.h
View File

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