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

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	src/gui/dboxinfo.cpp
	src/gui/infoviewer_bb.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9e8dd73320
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-02 (Mon, 02 Oct 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-10-02 23:19:49 +02:00
parent 6e4cd9f08c 586a1b5a49
commit 463700033b
38 changed files with 68 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/moviebrowser/mb.cpp
View File

@@ -1371,10 +1371,10 @@ std::string CMovieBrowser::getScreenshotName(std::string movie, bool is_dir)
else
found = movie.find_last_of(".");
if (found == string::npos)
if (found == std::string::npos)
return "";
vector<std::string>::iterator it = PicExts.begin();
std::vector<std::string>::iterator it = PicExts.begin();
while (it < PicExts.end()) {
ret = movie;
ext = *it;
@@ -1429,7 +1429,7 @@ void CMovieBrowser::refreshChannelLogo(void)
if (m_channelLogo && m_channelLogo->hasLogo())
{
// TODO: move into an own handler, eg. header, so channel logo should be paint in header object
m_channelLogo->setWidth(min(m_channelLogo->getWidth(), w_logo_max), true);
m_channelLogo->setWidth(std::min(m_channelLogo->getWidth(), w_logo_max), true);
if (m_channelLogo->getHeight() > h_logo_max)
m_channelLogo->setHeight(h_logo_max, true);
@@ -2950,7 +2950,7 @@ bool CMovieBrowser::addFile(CFile &file, int dirItNr)
movieInfo.file = file;
if(!m_movieInfo.loadMovieInfo(&movieInfo)) {
movieInfo.channelName = string(g_Locale->getText(LOCALE_MOVIEPLAYER_HEAD));
movieInfo.channelName = std::string(g_Locale->getText(LOCALE_MOVIEPLAYER_HEAD));
movieInfo.epgTitle = file.getFileName();
}
movieInfo.dirItNr = dirItNr;