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

fix compile; cleanup EPG replacements

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4c77ec8624
Author: vanhofen <vanhofen@gmx.de>
Date: 2024-10-08 (Tue, 08 Oct 2024)

Origin message was:
------------------
- fix compile; cleanup EPG replacements

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2024-10-08 22:23:59 +02:00
parent 57721aafef
commit 311c29efc4
5 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/eitd/SIevents.cpp
View File

@@ -517,7 +517,6 @@ void SIevent::setName(const std::string &lang, const std::string &name)
void SIevent::setName(unsigned int lang, const std::string &name)
{
std::string tmp = name;
std::replace(tmp.begin(), tmp.end(), '\\n', ' ');
std::replace(tmp.begin(), tmp.end(), '\n', ' ');
std::replace(tmp.begin(), tmp.end(), '\t', ' ');

8
src/gui/channellist.cpp
View File

@@ -1699,11 +1699,11 @@ void CChannelList::paintDetails(int index)
}
if (!(text2.empty())) {
text2 = str_replace("\\n", " ", text2);
while ( text2.find_first_of("[ -.+*#?=!$%&/]+") == 0 )
text2 = text2.substr( 1 );
text2 = text2.substr( 0, text2.find('\n') );
#if 0 //FIXME: to discuss, eat too much cpu time if string long enough
#if 0
// FIXME: to discuss, eat too much cpu time if string long enough
int pos = 0;
while ( ( pos != -1 ) && (g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->getRenderWidth(text2) > (full_width - 3*OFFSET_INNER_MID - noch_len) ) ) {
pos = text2.find_last_of(" ");
@@ -2767,10 +2767,6 @@ void CChannelList::processTextToArray(std::string text, int screening) // UTF-8
std::string aktLine = "";
std::string aktWord = "";
int aktWidth = 0;
if(!text.empty())
text = str_replace("\\n", "\n", text);
text += ' ';
const char *text_= text.c_str();

1
src/gui/epgplus.cpp
View File

@@ -390,7 +390,6 @@ void EpgPlus::ChannelEventEntry::paint(bool pisSelected, bool toggleColor)
std::string shortepg = shortEpgData.info1;
if(!shortepg.empty())
{
shortepg = str_replace("\\n", " ", shortepg);
shortepg = str_replace("\n", " ", shortepg);
shortepg = str_replace("\t", " ", shortepg);
}

4
src/gui/epgview.cpp
View File

@@ -191,10 +191,6 @@ void CEpgData::processTextToArray(std::string text, int screening, bool has_cove
std::string aktLine = "";
std::string aktWord = "";
int aktWidth = 0;
if(!text.empty())
text = str_replace("\\n", "\n", text);
text += ' ';
char* text_= (char*) text.c_str();

3
src/gui/eventlist.cpp
View File

@@ -880,9 +880,6 @@ void CEventList::paintDescription(int index)
else
infozone_text = g_Locale->getText(LOCALE_EPGLIST_NOEVENTS);
if(!infozone_text.empty())
infozone_text = str_replace("\\n", "\n", infozone_text);
infozone->setText(infozone_text, CTextBox::TOP, g_Font[SNeutrinoSettings::FONT_TYPE_EVENTLIST_EVENT]);
infozone->doPaintBg(false);
infozone->doPaintTextBoxBg(true);