movieplayer: change logic in updateLcd() function

Origin commit data
------------------
Branch: ni/coolstream
Commit: 047b01cba8
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-02-28 (Wed, 28 Feb 2018)

Origin message was:
------------------
- movieplayer: change logic in updateLcd() function

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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2018-02-28 23:45:54 +01:00
parent 1f0ffe2ff2
commit 5b86765f6e

View File

@@ -496,7 +496,7 @@ void CMoviePlayerGui::updateLcd(bool display_playtime)
std::string lcd; std::string lcd;
std::string name; std::string name;
if (display_playtime) if (display_playtime && g_info.hw_caps->display_xres >= 8)
{ {
int ss = position/1000; int ss = position/1000;
int hh = ss/3600; int hh = ss/3600;
@@ -504,43 +504,47 @@ void CMoviePlayerGui::updateLcd(bool display_playtime)
int mm = ss/60; int mm = ss/60;
ss -= mm * 60; ss -= mm * 60;
lcd = to_string(hh/10) + to_string(hh%10) + ":" + to_string(mm/10) + to_string(mm%10) + ":" + to_string(ss/10) + to_string(ss%10); lcd = to_string(hh/10) + to_string(hh%10) + ":" + to_string(mm/10) + to_string(mm%10) + ":" + to_string(ss/10) + to_string(ss%10);
CVFD::getInstance()->setMode(LCD_MODE);
CVFD::getInstance()->showMenuText(0, lcd.c_str(), -1, true);
return;
} }
if (isMovieBrowser && p_movie_info && !p_movie_info->epgTitle.empty() && p_movie_info->epgTitle.size() && strncmp(p_movie_info->epgTitle.c_str(), "not", 3))
name = p_movie_info->epgTitle;
else else
name = pretty_name; {
if (isMovieBrowser && p_movie_info && !p_movie_info->epgTitle.empty() && p_movie_info->epgTitle.size() && strncmp(p_movie_info->epgTitle.c_str(), "not", 3))
name = p_movie_info->epgTitle;
else
name = pretty_name;
switch (playstate) { switch (playstate)
case CMoviePlayerGui::PAUSE: {
if (speed < 0) { case CMoviePlayerGui::PAUSE:
sprintf(tmp, "%dx<| ", abs(speed)); if (speed < 0)
{
sprintf(tmp, "%dx<| ", abs(speed));
lcd = tmp;
}
else if (speed > 0)
{
sprintf(tmp, "%dx|> ", abs(speed));
lcd = tmp;
}
else
lcd = "|| ";
break;
case CMoviePlayerGui::REW:
sprintf(tmp, "%dx<< ", abs(speed));
lcd = tmp; lcd = tmp;
} else if (speed > 0) { break;
sprintf(tmp, "%dx|> ", abs(speed)); case CMoviePlayerGui::FF:
sprintf(tmp, "%dx>> ", abs(speed));
lcd = tmp; lcd = tmp;
} else break;
lcd = "|| "; case CMoviePlayerGui::PLAY:
break; lcd = "> ";
case CMoviePlayerGui::REW: break;
sprintf(tmp, "%dx<< ", abs(speed)); default:
lcd = tmp; break;
break; }
case CMoviePlayerGui::FF: lcd += name;
sprintf(tmp, "%dx>> ", abs(speed));
lcd = tmp;
break;
case CMoviePlayerGui::PLAY:
lcd = "> ";
break;
default:
break;
} }
lcd += name;
CVFD::getInstance()->setMode(LCD_MODE); CVFD::getInstance()->setMode(LCD_MODE);
CVFD::getInstance()->showMenuText(0, lcd.c_str(), -1, true); CVFD::getInstance()->showMenuText(0, lcd.c_str(), -1, true);
} }