mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 00:11:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ni/cst-next' into ni/mp/cst-next

Browse Source 
Origin commit data
------------------
Commit: 0d035edb33
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-29 (Thu, 29 Sep 2016)
This commit is contained in:
vanhofen
2016-09-29 11:59:40 +02:00
parent 5d2893e837 22a31dccd6
commit 7433978a1c
4 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/driver/neutrinofonts.h
View File

@@ -44,7 +44,7 @@ typedef struct font_sizes {
typedef struct font_sizes_groups { typedef struct font_sizes_groups {
const neutrino_locale_t groupname; const neutrino_locale_t groupname;
const unsigned int count; const size_t count;
const SNeutrinoSettings::FONT_TYPES *const content; const SNeutrinoSettings::FONT_TYPES *const content;
const char * const actionkey; const char * const actionkey;
const neutrino_locale_t hint; const neutrino_locale_t hint;

2
src/driver/streamts.cpp
View File

@@ -187,7 +187,7 @@ bool CStreamInstance::Open()
void CStreamInstance::run() void CStreamInstance::run()
{ {
printf("CStreamInstance::run: %llx\n", channel_id); printf("CStreamInstance::run: %" PRIx64 "\n", channel_id);
/* pids here cannot be empty */ /* pids here cannot be empty */
stream_pids_t::iterator it = pids.begin(); stream_pids_t::iterator it = pids.begin();

2
src/gui/components/cc_item.cpp
View File

@@ -55,6 +55,8 @@ CComponentsItem::CComponentsItem(CComponentsForm* parent)
void CComponentsItem::initParent(CComponentsForm* parent) void CComponentsItem::initParent(CComponentsForm* parent)
{ {
if (cc_parent == parent)
return;
cc_parent = parent; cc_parent = parent;
if (cc_parent) if (cc_parent)
cc_parent->addCCItem(this); cc_parent->addCCItem(this);

2
src/gui/movieplayer.cpp
View File

@@ -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) { } else if (msg == (neutrino_msg_t) g_settings.key_quickzap_up || msg == (neutrino_msg_t) g_settings.key_quickzap_down) {
quickZap(msg); quickZap(msg);
} else if (fromInfoviewer && msg == CRCInput::RC_ok && !filelist.empty()) { } 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; fromInfoviewer = false;
playstate = CMoviePlayerGui::STOPPED; playstate = CMoviePlayerGui::STOPPED;
filelist_it = vzap_it; filelist_it = vzap_it;