From 28ea70c55824a9898febf7a39bb9474c0f5ce957 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sun, 26 Mar 2017 23:23:01 +0200 Subject: [PATCH] lcd4l: add support for mode_upnp; ... use Getfile() instead of pretty_name in mode_ts Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/902e4e918dbf618038b171aec06b82f94e02c5a4 Author: vanhofen Date: 2017-03-26 (Sun, 26 Mar 2017) Origin message was: ------------------ - lcd4l: add support for mode_upnp; ... use Getfile() instead of pretty_name in mode_ts --- src/gui/lcd4l.cpp | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/src/gui/lcd4l.cpp b/src/gui/lcd4l.cpp index 3a2930678..652049f2e 100644 --- a/src/gui/lcd4l.cpp +++ b/src/gui/lcd4l.cpp @@ -615,6 +615,10 @@ void CLCD4l::ParseInfo(uint64_t parseID, bool newID, bool firstRun) Logo = ICONSDIR "/" NEUTRINO_ICON_MOVIEPLAYER ICONSEXT; } } + else if (parseID == MODE_UPNP) + { + Service = g_Locale->getText(LOCALE_UPNPBROWSER_HEAD); + } else if (parseID == MODE_STANDBY) { Service = "STANDBY"; @@ -798,10 +802,12 @@ void CLCD4l::ParseInfo(uint64_t parseID, bool newID, bool firstRun) snprintf(Start, sizeof(Start), "%02d:%02d", tm_struct->tm_hour, tm_struct->tm_min); } - //else if (parseID == MODE_PIC) - //{ +#if 0 + else if (parseID == MODE_PIC) + { // TODO: Event = Bildname - //} + } +#endif else if (parseID == MODE_TS) { if (CMoviePlayerGui::getInstance().p_movie_info) @@ -809,8 +815,8 @@ void CLCD4l::ParseInfo(uint64_t parseID, bool newID, bool firstRun) if (!CMoviePlayerGui::getInstance().p_movie_info->epgTitle.empty()) Event = CMoviePlayerGui::getInstance().p_movie_info->epgTitle; } - else if (!CMoviePlayerGui::getInstance().pretty_name.empty()) - Event = CMoviePlayerGui::getInstance().pretty_name; + else if (!CMoviePlayerGui::getInstance().GetFile().empty()) + Event = CMoviePlayerGui::getInstance().GetFile(); if (Event.empty()) Event = "MOVIE"; @@ -835,7 +841,12 @@ void CLCD4l::ParseInfo(uint64_t parseID, bool newID, bool firstRun) snprintf(End, sizeof(End), "%02d:%02d", tm_struct->tm_hour, tm_struct->tm_min); } - +#if 0 + else if (parseID == MODE_UPNP) + { + // TODO? + } +#endif /* ----------------------------------------------------------------- */ Event += "\n"; // make sure we have at least two lines in event-file