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

Merge remote-tracking branch 'check/cst-next'

Browse Source 
*needs buildfixing*

Conflicts:
	src/daemonc/Makefile.am
	src/daemonc/remotecontrol.cpp
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/pictureviewer/Makefile.am
	src/driver/vfd.cpp
	src/gui/bedit/Makefile.am
	src/gui/components/Makefile.am
	src/gui/luainstance.cpp
	src/gui/widget/Makefile.am
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/system/Makefile.am


Origin commit data
------------------
Branch: ni/coolstream
Commit: b5a64e6887
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-26 (Mon, 26 Jan 2015)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2015-01-26 17:26:26 +01:00
parent ba282cf8c4 7189a98486
commit 2263c8bd2e
106 changed files with 6374 additions and 5374 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/driver/lcdd.cpp
View File

@@ -483,8 +483,8 @@ void CLCD::showTextScreen(const std::string & big, const std::string & small, co
cname[namelines] = splitString(title, LCD_COLS, fonts.channelname, dumb, big_utf8);
title = removeLeadingSpaces(title.substr(cname[namelines].length()));
namelines++;
} while (title.length() > 0 && namelines < maxnamelines);
if (title.length() == 0)
} while (!title.empty() && namelines < maxnamelines);
if (title.empty())
break;
dumb = !dumb; // retry with dumb splitting;
if (!dumb) // second retry -> get out;
@@ -508,11 +508,11 @@ void CLCD::showTextScreen(const std::string & big, const std::string & small, co
title = removeLeadingSpaces(title.substr(event[eventlines].length()));
/* DrDish TV appends a 0x0a to the EPG title. We could strip it in sectionsd...
...instead, strip all control characters at the end of the text for now */
if (event[eventlines].length() > 0 && event[eventlines].at(event[eventlines].length() - 1) < ' ')
if (!event[eventlines].empty() && event[eventlines].at(event[eventlines].length() - 1) < ' ')
event[eventlines].erase(event[eventlines].length() - 1);
eventlines++;
} while (title.length() >0 && eventlines < maxeventlines);
if (title.length() == 0)
} while (!title.empty() && eventlines < maxeventlines);
if (title.empty())
break;
dumb = !dumb; // retry with dumb splitting;
if (!dumb) // second retry -> get out;