tripledragon: small cosmetic LCD fixes

Origin commit data
------------------
Branch: ni/coolstream
Commit: be99a52526
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-10 (Sat, 10 Nov 2012)


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

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2012-11-10 13:51:58 +01:00
parent 8280bfc581
commit 690bd7bca5
2 changed files with 7 additions and 5 deletions

View File

@@ -7,7 +7,7 @@
Homepage: http://dbox.cyberphoria.org/ Homepage: http://dbox.cyberphoria.org/
Copyright (C) 2008 Novell, Inc. Author: Stefan Seyfried Copyright (C) 2008 Novell, Inc. Author: Stefan Seyfried
(C) 2009 Stefan Seyfried (C) 2009-2012 Stefan Seyfried
License: GPL License: GPL
@@ -543,7 +543,7 @@ void CLCD::showTextScreen(const std::string & big, const std::string & small, co
displayUpdate(); displayUpdate();
} }
void CLCD::showServicename(const std::string name, const bool perform_wakeup) void CLCD::showServicename(const std::string name, const bool clear_epg)
{ {
/* /*
1 = show servicename 1 = show servicename
@@ -558,11 +558,13 @@ void CLCD::showServicename(const std::string name, const bool perform_wakeup)
if (!name.empty()) if (!name.empty())
servicename = name; servicename = name;
if (clear_epg)
epg_title.clear();
if (mode != MODE_TVRADIO) if (mode != MODE_TVRADIO)
return; return;
showTextScreen(servicename, epg_title, showmode, perform_wakeup, true); showTextScreen(servicename, epg_title, showmode, true, true);
return; return;
} }

View File

@@ -189,7 +189,7 @@ class CLCD
void setMode(const MODES m, const char * const title = ""); void setMode(const MODES m, const char * const title = "");
MODES getMode() { return mode; }; MODES getMode() { return mode; };
void showServicename(const std::string name, const bool perform_wakeup = true); // UTF-8 void showServicename(const std::string name, const bool clear_epg = false);
void setEPGTitle(const std::string title); void setEPGTitle(const std::string title);
void setMovieInfo(const AUDIOMODES playmode, const std::string big, const std::string small, const bool centered = false); void setMovieInfo(const AUDIOMODES playmode, const std::string big, const std::string small, const bool centered = false);
void setMovieAudio(const bool is_ac3); void setMovieAudio(const bool is_ac3);
@@ -234,7 +234,7 @@ class CLCD
void Unlock(); void Unlock();
void Clear(); void Clear();
void ShowIcon(vfd_icon icon, bool show); void ShowIcon(vfd_icon icon, bool show);
void ShowText(const char *s) { showServicename(std::string(s)); }; void ShowText(const char *s) { showServicename(std::string(s), true); };
#ifndef HAVE_TRIPLEDRAGON #ifndef HAVE_TRIPLEDRAGON
~CLCD(); ~CLCD();
#endif #endif