From b03e1b5832ed33522f0b88dc49e1f8f30622ac56 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Thu, 29 Sep 2016 10:18:45 +0200 Subject: [PATCH 1/4] CComponentsItem: prevent reinit of already initialized parent form Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/a4b2e25bf21e760549618fa0ab91b288147d76dc Author: Thilo Graf Date: 2016-09-29 (Thu, 29 Sep 2016) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/components/cc_item.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/gui/components/cc_item.cpp b/src/gui/components/cc_item.cpp index e973996e1..4b6e56e9c 100644 --- a/src/gui/components/cc_item.cpp +++ b/src/gui/components/cc_item.cpp @@ -55,6 +55,8 @@ CComponentsItem::CComponentsItem(CComponentsForm* parent) void CComponentsItem::initParent(CComponentsForm* parent) { + if (cc_parent == parent) + return; cc_parent = parent; if (cc_parent) cc_parent->addCCItem(this); From cc3478189f047b2920552a7a9fadc363968dd1f8 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Thu, 29 Sep 2016 09:08:15 +0200 Subject: [PATCH 2/4] movieplayer: fix -Wformat warning Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/256b0965baab5a137d0682ce096d52a2c9709ddb Author: vanhofen Date: 2016-09-29 (Thu, 29 Sep 2016) Origin message was: ------------------ - movieplayer: fix -Wformat warning ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- 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 e244d798c..800ce266b 100644 --- a/src/gui/movieplayer.cpp +++ b/src/gui/movieplayer.cpp @@ -1380,7 +1380,7 @@ void CMoviePlayerGui::PlayFileLoop(void) } else if (msg == (neutrino_msg_t) g_settings.key_quickzap_up || msg == (neutrino_msg_t) g_settings.key_quickzap_down) { quickZap(msg); } else if (fromInfoviewer && msg == CRCInput::RC_ok && !filelist.empty()) { - printf("CMoviePlayerGui::%s: start playlist movie #%d\n", __func__, vzap_it - filelist.begin()); + printf("CMoviePlayerGui::%s: start playlist movie #%ld\n", __func__, vzap_it - filelist.begin()); fromInfoviewer = false; playstate = CMoviePlayerGui::STOPPED; filelist_it = vzap_it; From 45ce83f50c4547b053f29f39cba7384f063b630e Mon Sep 17 00:00:00 2001 From: vanhofen Date: Thu, 29 Sep 2016 09:32:56 +0200 Subject: [PATCH 3/4] streamts: fix -Wformat warning Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/f45d4d2bd5ad7b0e554625d06f4247cee24d9fdd Author: vanhofen Date: 2016-09-29 (Thu, 29 Sep 2016) Origin message was: ------------------ - streamts: fix -Wformat warning ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/driver/streamts.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/driver/streamts.cpp b/src/driver/streamts.cpp index 74379e4be..a917d2352 100644 --- a/src/driver/streamts.cpp +++ b/src/driver/streamts.cpp @@ -176,7 +176,7 @@ bool CStreamInstance::Open() void CStreamInstance::run() { - printf("CStreamInstance::run: %llx\n", channel_id); + printf("CStreamInstance::run: %" PRIx64 "\n", channel_id); /* pids here cannot be empty */ stream_pids_t::iterator it = pids.begin(); From 171aac8521c491397b0aa51ec689435f6b490240 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Thu, 29 Sep 2016 10:08:54 +0200 Subject: [PATCH 4/4] neutrinofonts: fix -Wnarrowing warning in osd_setup Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/f9934cde5374794bd248d5d557a52a60f46a6fa6 Author: vanhofen Date: 2016-09-29 (Thu, 29 Sep 2016) Origin message was: ------------------ - neutrinofonts: fix -Wnarrowing warning in osd_setup ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/driver/neutrinofonts.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/driver/neutrinofonts.h b/src/driver/neutrinofonts.h index 965b89f8f..9be5cff4f 100644 --- a/src/driver/neutrinofonts.h +++ b/src/driver/neutrinofonts.h @@ -44,7 +44,7 @@ typedef struct font_sizes { typedef struct font_sizes_groups { const neutrino_locale_t groupname; - const unsigned int count; + const size_t count; const SNeutrinoSettings::FONT_TYPES *const content; const char * const actionkey; const neutrino_locale_t hint;