From 89516e3326c843b5a08c8d4de0487ce39dca6612 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Sun, 3 Dec 2017 10:47:05 +0100 Subject: [PATCH 1/4] fix resource leak Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/1f96c8a4d42715981c5bfb5200e726d7da368c02 Author: Jacek Jendrzej Date: 2017-12-03 (Sun, 03 Dec 2017) --- src/gui/update.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/gui/update.cpp b/src/gui/update.cpp index 8db1a3ba3..eae27a8fe 100644 --- a/src/gui/update.cpp +++ b/src/gui/update.cpp @@ -649,6 +649,7 @@ int CFlashUpdate::exec(CMenuTarget* parent, const std::string &actionKey) c[0] = fgetc(f); printf("[update] Current partition: %s\n", c); } + fcolse(f); } // select partition From 5cae76c7c20dda4e3c4f191bec20dfceac14d97e Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Sun, 3 Dec 2017 10:57:20 +0100 Subject: [PATCH 2/4] typo Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/a6a256190bf4addeca6ef3b35b3ff7e947daf994 Author: Jacek Jendrzej Date: 2017-12-03 (Sun, 03 Dec 2017) --- src/gui/update.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/update.cpp b/src/gui/update.cpp index eae27a8fe..9647dfd84 100644 --- a/src/gui/update.cpp +++ b/src/gui/update.cpp @@ -649,7 +649,7 @@ int CFlashUpdate::exec(CMenuTarget* parent, const std::string &actionKey) c[0] = fgetc(f); printf("[update] Current partition: %s\n", c); } - fcolse(f); + fclose(f); } // select partition From 97e879a32e9867fa3023f0864612755c33a5e95f Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Sun, 3 Dec 2017 11:06:16 +0100 Subject: [PATCH 3/4] enable yt for generic Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/09858af7a825cc47b58694749a4594acc400308b Author: Jacek Jendrzej Date: 2017-12-03 (Sun, 03 Dec 2017) --- src/gui/movieplayer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp index 604ff3f24..7a3a50347 100644 --- a/src/gui/movieplayer.cpp +++ b/src/gui/movieplayer.cpp @@ -408,7 +408,7 @@ int CMoviePlayerGui::exec(CMenuTarget * parent, const std::string & actionKey) moviebrowser->setMode(MB_SHOW_RECORDS); wakeup_hdd(g_settings.network_nfs_recordingdir.c_str()); } -#if HAVE_COOL_HARDWARE +#if HAVE_COOL_HARDWARE || HAVE_GENERIC_HARDWARE else if (actionKey == "ytplayback") { isMovieBrowser = true; moviebrowser->setMode(MB_SHOW_YT); From 8cf6c1b86ee96b8fa114a1b0101c1afbe443f462 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Sun, 3 Dec 2017 16:55:20 +0100 Subject: [PATCH 4/4] fix radiotext title background (merge fix) Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/30c0a32a48147476a29c2b3ebc8b8a5cf8f57562 Author: Jacek Jendrzej Date: 2017-12-03 (Sun, 03 Dec 2017) --- src/gui/infoviewer.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp index 9d2bb9642..ea565a6a3 100644 --- a/src/gui/infoviewer.cpp +++ b/src/gui/infoviewer.cpp @@ -1361,6 +1361,9 @@ void CInfoViewer::showRadiotext() sprintf(stext[0], g_Radiotext->RT_PTY == 0 ? "%s %s%s" : "%s (%s)%s", tr("Radiotext"), g_Radiotext->RT_PTY == 0 ? g_Radiotext->RDS_PTYN : g_Radiotext->ptynr2string(g_Radiotext->RT_PTY), ":"); int title_w = g_Font[rt_font]->getRenderWidth(stext[0]) + 2*OFFSET_INNER_MID; + frameBuffer->paintBoxRel(rt_x + OFFSET_SHADOW, rt_y + OFFSET_SHADOW, title_w, 2*OFFSET_INNER_SMALL + item_h, COL_SHADOW_PLUS_0, RADIUS_LARGE, CORNER_TOP); + frameBuffer->paintBoxRel(rt_x, rt_y, title_w, 2*OFFSET_INNER_SMALL + item_h, COL_INFOBAR_PLUS_0, RADIUS_LARGE, CORNER_TOP); + g_Font[rt_font]->RenderString(item_x, item_y, title_w, stext[0], COL_INFOBAR_TEXT, 0, RTisUTF8); } item = 1;