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; diff --git a/src/driver/streamts.cpp b/src/driver/streamts.cpp index 684eeabba..056516230 100644 --- a/src/driver/streamts.cpp +++ b/src/driver/streamts.cpp @@ -187,7 +187,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(); 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); diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp index dd387458d..52c9a25a0 100644 --- a/src/gui/movieplayer.cpp +++ b/src/gui/movieplayer.cpp @@ -1445,7 +1445,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;