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

Merge branch 'master' into pu/mp

Browse Source
This commit is contained in:
Jacek Jendrzej
2017-10-02 13:56:25 +02:00
parent 08dc0d7561 2f39081708
commit 7ad4a0e6cc
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

@@ -1279,10 +1279,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;
@@ -1325,7 +1325,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);
@@ -2846,7 +2846,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;