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

yWeb: rework for basic functionality

Browse Source 
Based on the last changes by svenhoefer
This commit is contained in:
Thilo Graf
2022-11-07 21:22:45 +01:00
parent 8189f3c86d
commit ccf604cc8e
145 changed files with 11179 additions and 596 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/streaminfo1.cpp
View File

@@ -821,7 +821,7 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
spaceoffset = 7 * fontW;
box_width2 = box_width-(spaceoffset+xpos);
//NI channellogo
// channellogo
ypos+= sheight;
sprintf(buf, "%llx.png", channel->getChannelID() & 0xFFFFFFFFFFFFULL);
g_Font[font_small]->RenderString(xpos, ypos, box_width, "Logo:" , COL_INFOBAR_TEXT);

3
src/nhttpd/tuxboxapi/neutrinoyparser.cpp
View File

@@ -878,7 +878,7 @@ std::string CNeutrinoYParser::func_get_boxmodel(CyhookHandler *, std::string)
//-------------------------------------------------------------------------
// y-func : get stream info
//-------------------------------------------------------------------------
std::string CNeutrinoYParser::func_get_current_stream_info(CyhookHandler *hh, std::string)
std::string CNeutrinoYParser::func_get_current_stream_info(CyhookHandler *hh, std::string)
{
CZapitClient::CCurrentServiceInfo serviceinfo;
@@ -896,7 +896,6 @@ std::string CNeutrinoYParser::func_get_current_stream_info(CyhookHandler *hh, s
hh->ParamList["ServiceName"] = NeutrinoAPI->GetServiceName(CZapit::getInstance()->GetCurrentChannelID());
hh->ParamList["Url"] = CZapit::getInstance()->GetCurrentChannel()->getUrl().c_str();
hh->ParamList["VideoFormat"] = NeutrinoAPI->getVideoResolutionAsString();
// hh->ParamList["BitRate"] = NeutrinoAPI->getVideoFramerateAsString();
hh->ParamList["AspectRatio"] = NeutrinoAPI->getVideoAspectRatioAsString();
hh->ParamList["FPS"] = NeutrinoAPI->getVideoFramerateAsString();
hh->ParamList["AudioType"] = NeutrinoAPI->getAudioInfoAsString();

2
src/nhttpd/yhttpd_core/helper.cpp
View File

@@ -413,7 +413,7 @@ std::string yExecuteScript(std::string cmd) {
script = cmd;
// get file
std::string fullfilename;
script += ".sh"; //add script extention
script += ".sh"; //add script extension
char cwd[255];
getcwd(cwd, 254);

2
src/zapit/include/zapit/getservices.h
View File

@@ -128,7 +128,7 @@ class CServiceManager
CZapitChannel* FindChannel(const t_channel_id channel_id, bool * current_is_nvod = NULL);
CZapitChannel* FindChannelByName(std::string name);
CZapitChannel* FindChannelByPattern(std::string pattern); //NI
CZapitChannel* FindChannelByPattern(std::string pattern);
CZapitChannel* FindCurrentChannel(const t_channel_id channel_id);
CZapitChannel* FindChannel48(const t_channel_id channel_id);
CZapitChannel* FindChannelFuzzy(const t_channel_id channel_id,

2
src/zapit/src/getservices.cpp
View File

@@ -220,7 +220,7 @@ CZapitChannel * CServiceManager::FindChannelByName(std::string name)
return NULL;
}
//NI
CZapitChannel * CServiceManager::FindChannelByPattern(std::string pattern)
{
for (channel_map_iterator_t it = allchans.begin(); it != allchans.end(); ++it) {