From 3240811349c6a51a91923856a5538194d46a678e Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Wed, 11 Feb 2015 19:21:54 +0100 Subject: [PATCH 01/25] fix compiling warnings Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/1bfcad398f136da581035b6e295e51bf5ed1ec6f Author: Jacek Jendrzej Date: 2015-02-11 (Wed, 11 Feb 2015) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/driver/rcinput.cpp | 2 +- src/driver/scanepg.cpp | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/driver/rcinput.cpp b/src/driver/rcinput.cpp index 727306d0c..bc7cc2eaa 100644 --- a/src/driver/rcinput.cpp +++ b/src/driver/rcinput.cpp @@ -637,7 +637,7 @@ void CRCInput::getMsg_us(neutrino_msg_t * msg, neutrino_msg_data_t * data, uint6 #ifdef KEYBOARD_INSTEAD_OF_REMOTE_CONTROL if (FD_ISSET(fd_keyb, &rfds)) { - int trkey; + uint32_t trkey; char key = 0; read(fd_keyb, &key, sizeof(key)); diff --git a/src/driver/scanepg.cpp b/src/driver/scanepg.cpp index 4d2f37b6b..24c6e3d33 100644 --- a/src/driver/scanepg.cpp +++ b/src/driver/scanepg.cpp @@ -337,8 +337,10 @@ void CEpgScan::EnterStandby() void CEpgScan::Next() { - bool llocked = false, plocked = false; - + bool llocked = false; +#ifdef ENABLE_PIP + bool plocked = false; +#endif next_chid = 0; if (!standby && CNeutrinoApp::getInstance()->getMode() == NeutrinoMessages::mode_standby) From b1099e70238af72b2a9041a195e51a1efad88d7e Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Fri, 13 Feb 2015 16:15:04 +0300 Subject: [PATCH 02/25] zapit/src/bouquets.cpp: fix favorites webtv channels not found in webtv xml files Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/63d8c8e90b819d4e4b32a88de478625a40c91b70 Author: [CST] Focus Date: 2015-02-13 (Fri, 13 Feb 2015) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/zapit/src/bouquets.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/zapit/src/bouquets.cpp b/src/zapit/src/bouquets.cpp index 54a826805..81e8e3677 100644 --- a/src/zapit/src/bouquets.cpp +++ b/src/zapit/src/bouquets.cpp @@ -447,8 +447,14 @@ void CBouquetManager::parseBouquetsXml(const char *fname, bool bUser) newBouquet->addService(chan); } else if (bUser) { - chan = new CZapitChannel(name2, CREATE_CHANNEL_ID64, 1 /*service_type*/, - satellitePosition, freq); + if (url) { + chid = create_channel_id64(0, 0, 0, 0, 0, url); + chan = new CZapitChannel(name2.c_str(), chid, url, NULL); + } + else + chan = new CZapitChannel(name2, CREATE_CHANNEL_ID64, 1 /*service_type*/, + satellitePosition, freq); + CServiceManager::getInstance()->AddChannel(chan); chan->flags = CZapitChannel::NOT_FOUND; chan->bLocked = clock; From a9d352137bb8b4f928ffe7083473dcaabe0d18aa Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Tue, 10 Feb 2015 14:28:10 +0100 Subject: [PATCH 03/25] CThemes: make saveFile and readFile accept const char* param this removes the need for ugly (char *) casts Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/3fa68cae90c3cf42d797bfbc8563ed9643402816 Author: Stefan Seyfried Date: 2015-02-10 (Tue, 10 Feb 2015) ------------------ This commit was generated by Migit --- src/gui/themes.cpp | 10 +++++----- src/gui/themes.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/gui/themes.cpp b/src/gui/themes.cpp index e37e066a9..a271c7d70 100644 --- a/src/gui/themes.cpp +++ b/src/gui/themes.cpp @@ -82,10 +82,10 @@ int CThemes::exec(CMenuTarget* parent, const std::string & actionKey) if ( strstr(themeFile.c_str(), "{U}") != 0 ) { themeFile.erase(0, 3); - readFile((char*)((std::string)THEMEDIR_VAR + themeFile + FILE_PREFIX).c_str()); + readFile(((std::string)THEMEDIR_VAR + themeFile + FILE_PREFIX).c_str()); } else - readFile((char*)((std::string)THEMEDIR + themeFile + FILE_PREFIX).c_str()); + readFile(((std::string)THEMEDIR + themeFile + FILE_PREFIX).c_str()); } return res; } @@ -177,7 +177,7 @@ int CThemes::Show() int res = themes.exec(NULL, ""); if (!file_name.empty()) { - saveFile((char*)((std::string)THEMEDIR_VAR + file_name + FILE_PREFIX).c_str()); + saveFile(((std::string)THEMEDIR_VAR + file_name + FILE_PREFIX).c_str()); } if (hasThemeChanged) { @@ -203,7 +203,7 @@ void CThemes::rememberOldTheme(bool remember) } } -void CThemes::readFile(char* themename) +void CThemes::readFile(const char *themename) { if(themefile.loadConfig(themename)) { @@ -218,7 +218,7 @@ void CThemes::readFile(char* themename) printf("[neutrino theme] %s not found\n", themename); } -void CThemes::saveFile(char * themename) +void CThemes::saveFile(const char *themename) { setTheme(themefile); diff --git a/src/gui/themes.h b/src/gui/themes.h index 2560c90e9..8919e3c29 100644 --- a/src/gui/themes.h +++ b/src/gui/themes.h @@ -40,8 +40,8 @@ class CThemes : public CMenuTarget, CChangeObserver bool hasThemeChanged; int Show(); - void readFile(char* themename); - void saveFile(char* themename); + void readFile(const char *themename); + void saveFile(const char *themename); void readThemes(CMenuWidget &); void rememberOldTheme(bool remember); void move_userDir(); From dbbb5e1143df53df5119bbe49673c0c0e405a903 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Tue, 10 Feb 2015 14:29:21 +0100 Subject: [PATCH 04/25] themes: remove unneccessary (char *) casts Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/9a6d65937f5e9ddee823be44be0a67cb1aa0cf8e Author: Stefan Seyfried Date: 2015-02-10 (Tue, 10 Feb 2015) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/themes.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gui/themes.cpp b/src/gui/themes.cpp index a271c7d70..4900194e5 100644 --- a/src/gui/themes.cpp +++ b/src/gui/themes.cpp @@ -133,9 +133,9 @@ void CThemes::readThemes(CMenuWidget &themes) *pos = '\0'; if ( p == 1 ) { userThemeFile = "{U}" + (std::string)file; - oj = new CMenuForwarder((char*)file, true, "", this, userThemeFile.c_str()); + oj = new CMenuForwarder(file, true, "", this, userThemeFile.c_str()); } else - oj = new CMenuForwarder((char*)file, true, "", this, file); + oj = new CMenuForwarder(file, true, "", this, file); themes.addItem( oj ); } free(themelist[count]); @@ -362,8 +362,8 @@ void CThemes::move_userDir() const char *file = themelist[count]->d_name; if (strcmp(file, ".") == 0 || strcmp(file, "..") == 0) continue; - const char *dest = (char*)((std::string)USERDIR + file).c_str(); - const char *target = (char*)((std::string)THEMEDIR_VAR + file).c_str(); + const char *dest = ((std::string)USERDIR + file).c_str(); + const char *target = ((std::string)THEMEDIR_VAR + file).c_str(); printf("[neutrino theme] moving %s to %s\n", dest, target); rename(dest, target); } From 18fd7cb227ff7d49f09ade73abcb89d54d07932d Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Tue, 10 Feb 2015 14:44:23 +0100 Subject: [PATCH 05/25] lcdd: remove useless cast Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/e73d266c3ef1d00e8ac057a6fe6bc56490925fc5 Author: Stefan Seyfried Date: 2015-02-10 (Tue, 10 Feb 2015) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/driver/lcdd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/driver/lcdd.cpp b/src/driver/lcdd.cpp index 5c5e3711d..74193ed4b 100644 --- a/src/driver/lcdd.cpp +++ b/src/driver/lcdd.cpp @@ -627,7 +627,7 @@ void CLCD::showTime() } else { - strftime((char*) ×tr, 20, "%H:%M", t); + strftime(timestr, 20, "%H:%M", t); clearClock = 1; } From 8df72acd9c9aaac576c7c175de6c7146b5057029 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Tue, 10 Feb 2015 14:54:48 +0100 Subject: [PATCH 06/25] channellist: remove bogus (char *) casts Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/b3252681235d2492374d5ebd486f1c071eaec478 Author: Stefan Seyfried Date: 2015-02-10 (Tue, 10 Feb 2015) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/channellist.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index 0e867b3c2..85bfdce03 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -1298,7 +1298,7 @@ int CChannelList::numericZap(int key) while(1) { if (lastchan != chn) { - snprintf((char*) &valstr, sizeof(valstr), "%d", chn); + snprintf(valstr, sizeof(valstr), "%d", chn); while(strlen(valstr) < maxchansize) strcat(valstr,"-"); //"_" @@ -1862,7 +1862,7 @@ void CChannelList::paintItem(int pos, const bool firstpaint) title_offset=6; } - snprintf((char*) tmp, sizeof(tmp), "%d", this->historyMode ? pos : chan->number); + snprintf(tmp, sizeof(tmp), "%d", this->historyMode ? pos : chan->number); CChannelEvent *p_event=NULL; if (displayNext) @@ -1974,7 +1974,7 @@ void CChannelList::paintItem(int pos, const bool firstpaint) { struct tm *pStartZeit = localtime(&p_event->startTime); - snprintf((char*) tmp, sizeof(tmp), "%02d:%02d", pStartZeit->tm_hour, pStartZeit->tm_min); + snprintf(tmp, sizeof(tmp), "%02d:%02d", pStartZeit->tm_hour, pStartZeit->tm_min); g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST_NUMBER]->RenderString(x+ 5+ numwidth+ 6, ypos+ xtheight, width- numwidth- 20- 15 -prg_offset, tmp, tcolor); } else @@ -2318,7 +2318,7 @@ void CChannelList::processTextToArray(std::string text, int screening) // UTF-8 std::string aktWord = ""; int aktWidth = 0; text += ' '; - char* text_= (char*) text.c_str(); + const char *text_= text.c_str(); while (*text_!=0) { From 4e54d5c781ec8778bbe0df92aad039409407a331 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Tue, 10 Feb 2015 14:55:45 +0100 Subject: [PATCH 07/25] moviebrowser/player: remove unneeded (char *) casts Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/b90991da77b9ba797d3b2f01a40f45b921dde4d5 Author: Stefan Seyfried Date: 2015-02-10 (Tue, 10 Feb 2015) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/moviebrowser.cpp | 2 +- src/gui/movieplayer.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/moviebrowser.cpp b/src/gui/moviebrowser.cpp index fab0174cd..59b06740e 100644 --- a/src/gui/moviebrowser.cpp +++ b/src/gui/moviebrowser.cpp @@ -3907,7 +3907,7 @@ static off64_t truncate_movie(MI_MOVIE_INFO * minfo) char spart[255]; int part = 0, tpart = 0; bool found = 0; - char * name = (char *) minfo->file.Name.c_str(); + const char *name = minfo->file.Name.c_str(); off64_t size = minfo->file.Size; int len = minfo->length; int seconds = minfo->bookmarks.end; diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp index d4f8c3271..c37d741ab 100644 --- a/src/gui/movieplayer.cpp +++ b/src/gui/movieplayer.cpp @@ -603,7 +603,7 @@ bool CMoviePlayerGui::PlayBackgroundStart(const std::string &file, const std::st int agen[] = { 18, 16, 12, 6, 0 }; for (int i = 0; ages[i] && age < 0; i++) { const char *n = name.c_str(); - char *h = (char *) n; + const char *h = n; while ((age < 0) && (h = strstr(h, ages[i]))) if ((h == n) || !isdigit(*(h - 1))) age = agen[i]; From 567c56420c4d40f9789f0ce7e78e094c5ba5a14f Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Tue, 10 Feb 2015 14:56:21 +0100 Subject: [PATCH 08/25] zapit/channel: remove bogus (char *) cast Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/30f398858300ca16e731bd5decd2eef2a5d26edd Author: Stefan Seyfried Date: 2015-02-10 (Tue, 10 Feb 2015) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/zapit/src/channel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/zapit/src/channel.cpp b/src/zapit/src/channel.cpp index 320613c34..c13337cbc 100644 --- a/src/zapit/src/channel.cpp +++ b/src/zapit/src/channel.cpp @@ -194,7 +194,7 @@ bool CZapitChannel::isHD() //printf("[zapit] HD channel: %s type 0x%X\n", name.c_str(), serviceType); return true; case ST_DIGITAL_TELEVISION_SERVICE: { - char * temp = (char *) name.c_str(); + const char *temp = name.c_str(); int len = name.size(); if((len > 1) && temp[len-2] == 'H' && temp[len-1] == 'D') { //printf("[zapit] HD channel: %s type 0x%X\n", name.c_str(), serviceType); From c373c1e834c6292d29228ee1afd412a42a8ff4c2 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Tue, 10 Feb 2015 14:57:15 +0100 Subject: [PATCH 09/25] osdlang_setup: avoid unnecessary (char *) casts Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/b6a406deb4790c8beb1055358e26e42af4c2c2c7 Author: Stefan Seyfried Date: 2015-02-10 (Tue, 10 Feb 2015) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/osdlang_setup.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/osdlang_setup.cpp b/src/gui/osdlang_setup.cpp index d00b6d922..433b7b0df 100644 --- a/src/gui/osdlang_setup.cpp +++ b/src/gui/osdlang_setup.cpp @@ -177,7 +177,7 @@ void COsdLangSetup::showLanguageSetup(CMenuWidget *osdl_setup) { struct dirent **namelist; int n; - char *pfad[] = {(char *) DATADIR "/neutrino/locale",(char *) "/var/tuxbox/locale"}; + const char *pfad[] = {DATADIR "/neutrino/locale", CONFIGDIR "/locale"}; osdl_setup->addIntroItems(); From 903314d055e783d841051f823929293e7f5f40e3 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Tue, 10 Feb 2015 14:58:35 +0100 Subject: [PATCH 10/25] infoviewer_bb: remove unnecessary (char *) casts change paint_ca_icons to accept (const char *) to achieve this Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/dc99e757e969675235b36b1b658d88d17cffa46f Author: Stefan Seyfried Date: 2015-02-10 (Tue, 10 Feb 2015) ------------------ This commit was generated by Migit --- src/gui/infoviewer_bb.cpp | 12 ++++++------ src/gui/infoviewer_bb.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/gui/infoviewer_bb.cpp b/src/gui/infoviewer_bb.cpp index 3d0c26bc2..18aa19bf2 100644 --- a/src/gui/infoviewer_bb.cpp +++ b/src/gui/infoviewer_bb.cpp @@ -672,7 +672,7 @@ void CInfoViewerBB::showBarHdd(int percent) } } -void CInfoViewerBB::paint_ca_icons(int caid, char * icon, int &icon_space_offset) +void CInfoViewerBB::paint_ca_icons(int caid, const char *icon, int &icon_space_offset) { char buf[20]; int endx = g_InfoViewer->BoxEndX - 10; @@ -748,8 +748,8 @@ void CInfoViewerBB::showIcon_CA_Status(int notfirst) } int caids[] = { 0x900, 0xD00, 0xB00, 0x1800, 0x0500, 0x0100, 0x600, 0x2600, 0x4a00, 0x0E00 }; - const char * white = (char *) "white"; - const char * yellow = (char *) "yellow"; + const char *white = "white"; + const char *yellow = "yellow"; int icon_space_offset = 0; if(!g_InfoViewer->chanready) { @@ -759,7 +759,7 @@ void CInfoViewerBB::showIcon_CA_Status(int notfirst) } else if(g_settings.casystem_display == 0) { for (int i = 0; i < (int)(sizeof(caids)/sizeof(int)); i++) { - paint_ca_icons(caids[i], (char *) white, icon_space_offset); + paint_ca_icons(caids[i], white, icon_space_offset); } } return; @@ -793,9 +793,9 @@ void CInfoViewerBB::showIcon_CA_Status(int notfirst) break; } if(g_settings.casystem_display == 0) - paint_ca_icons(caids[i], (char *) (found ? yellow : white), icon_space_offset); + paint_ca_icons(caids[i], (found ? yellow : white), icon_space_offset); else if(found) - paint_ca_icons(caids[i], (char *) yellow, icon_space_offset); + paint_ca_icons(caids[i], yellow, icon_space_offset); } } } diff --git a/src/gui/infoviewer_bb.h b/src/gui/infoviewer_bb.h index 831e2d793..5bdd590c9 100644 --- a/src/gui/infoviewer_bb.h +++ b/src/gui/infoviewer_bb.h @@ -115,7 +115,7 @@ class CInfoViewerBB bool checkBBIcon(const char * const icon, int *w, int *h); void showIcon_DD(void); - void paint_ca_icons(int, char*, int&); + void paint_ca_icons(int, const char*, int&); void paintCA_bar(int,int); void showOne_CAIcon(); void changePB(void); From bc240399a71773a69f99250ff55e50da2edd15f5 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Tue, 10 Feb 2015 15:09:14 +0100 Subject: [PATCH 11/25] move hddstat.h include from infoviewer_bb to neutrino Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/8658fb41a4fbc25cfd10c0d1e229e99cc0424778 Author: Stefan Seyfried Date: 2015-02-10 (Tue, 10 Feb 2015) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/infoviewer_bb.h | 1 - src/neutrino.cpp | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/infoviewer_bb.h b/src/gui/infoviewer_bb.h index 5bdd590c9..8dd800134 100644 --- a/src/gui/infoviewer_bb.h +++ b/src/gui/infoviewer_bb.h @@ -40,7 +40,6 @@ #include #include #include -#include #include "widget/menue.h" #include #include diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 6632a9a3d..4cd330c21 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -111,6 +111,7 @@ #include #include +#include #include #include #include From 43f4d834ed22f10ca9bd1b4b8b9383bf7b2579c4 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Tue, 10 Feb 2015 15:38:21 +0100 Subject: [PATCH 12/25] infoviewer: use forward declaration instead of including infoviewer_bb Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/967f85eb5ff862738195a1229625e1b65b719430 Author: Stefan Seyfried Date: 2015-02-10 (Tue, 10 Feb 2015) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/infoviewer.cpp | 1 + src/gui/infoviewer.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp index 7f5e588a3..c1c77ec04 100644 --- a/src/gui/infoviewer.cpp +++ b/src/gui/infoviewer.cpp @@ -33,6 +33,7 @@ #include #endif #include "infoviewer.h" +#include "infoviewer_bb.h" #include diff --git a/src/gui/infoviewer.h b/src/gui/infoviewer.h index 1047a41e4..b21ed7d40 100644 --- a/src/gui/infoviewer.h +++ b/src/gui/infoviewer.h @@ -41,11 +41,11 @@ #include #include #include "widget/menue.h" -#include #include #include #include +class CInfoViewerBB; class CInfoViewer { private: From 34024351ba1d5129ce20cd4ba537b487c1388d84 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Wed, 11 Feb 2015 08:22:36 +0100 Subject: [PATCH 13/25] neutrino.h: use forward declaration instead of includes this reduces the dependency chain on partial rebuilds considerably Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/b3bfb361f580c321ab1f356e6039b388f6740d77 Author: Stefan Seyfried Date: 2015-02-11 (Wed, 11 Feb 2015) ------------------ This commit was generated by Migit --- src/gui/user_menue.cpp | 1 + src/neutrino.cpp | 1 + src/neutrino.h | 13 +++++-------- src/neutrino_menue.cpp | 1 + 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/gui/user_menue.cpp b/src/gui/user_menue.cpp index c487c66f7..6596035b0 100644 --- a/src/gui/user_menue.cpp +++ b/src/gui/user_menue.cpp @@ -61,6 +61,7 @@ #endif #include "pluginlist.h" #include "infoclock.h" +#include "rc_lock.h" #include #include diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 4cd330c21..364002b1c 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -100,6 +100,7 @@ #include "gui/pipsetup.h" #endif #include "gui/themes.h" +#include "gui/timerlist.h" #include diff --git a/src/neutrino.h b/src/neutrino.h index 44c06e6a7..0a704617b 100644 --- a/src/neutrino.h +++ b/src/neutrino.h @@ -33,19 +33,12 @@ #ifndef __neutrino__ #define __neutrino__ -#include - #include -#include "driver/framebuffer.h" -#include "driver/neutrinofonts.h" -#include "system/setting_helpers.h" -#include "system/configure_network.h" #include "daemonc/remotecontrol.h" /* st_rmsg */ #include "gui/channellist.h" /* CChannelList */ #include "gui/personalize.h" -#include "gui/rc_lock.h" #include "gui/user_menue.h" -#include "gui/timerlist.h" +#include #include @@ -60,6 +53,10 @@ extern const unsigned char genre_sub_classes[]; /* epgview.cpp */ extern const neutrino_locale_t * genre_sub_classes_list[]; /* epgview.cpp */ +class CFrameBuffer; +class CConfigFile; +class CScanSettings; + class CNeutrinoApp : public CMenuTarget, CChangeObserver { public: diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp index 87e73620b..ad36eb999 100644 --- a/src/neutrino_menue.cpp +++ b/src/neutrino_menue.cpp @@ -69,6 +69,7 @@ #include "gui/scan_setup.h" #include "gui/settings_manager.h" #include "gui/sleeptimer.h" +#include "gui/timerlist.h" #include "gui/update_menue.h" #include "gui/streaminfo2.h" #ifdef ENABLE_TESTING From a5e790af412df14c3e12f525ede3d594566092e1 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Wed, 11 Feb 2015 08:32:52 +0100 Subject: [PATCH 14/25] record.h: replace includes with forward declaration Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/baf6bcdb979d323c32d9af3badc2ee7884312be5 Author: Stefan Seyfried Date: 2015-02-11 (Wed, 11 Feb 2015) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/driver/record.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/driver/record.h b/src/driver/record.h index abc54abb5..faeeae89c 100644 --- a/src/driver/record.h +++ b/src/driver/record.h @@ -27,14 +27,10 @@ #include #include -#include #include #include #include -#include -#include -#include #if HAVE_COOL_HARDWARE #include @@ -56,6 +52,8 @@ #define TSHIFT_MODE_PAUSE 2 #define TSHIFT_MODE_REWIND 3 +class CFrontend; + //FIXME enum record_error_msg_t { From 0272e57ed197a3b859a7021467d9b664e58aeb43 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Wed, 11 Feb 2015 08:36:12 +0100 Subject: [PATCH 15/25] epgplus.h: replace includes with forward declaration Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/930bd738f4d292163d422e4c55c6960f4f2c4a75 Author: Stefan Seyfried Date: 2015-02-11 (Wed, 11 Feb 2015) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/epgplus.cpp | 1 + src/gui/epgplus.h | 11 ++--------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/gui/epgplus.cpp b/src/gui/epgplus.cpp index e14498578..13bb7985a 100644 --- a/src/gui/epgplus.cpp +++ b/src/gui/epgplus.cpp @@ -31,6 +31,7 @@ #include #include +#include #include #include #include diff --git a/src/gui/epgplus.h b/src/gui/epgplus.h index b03aed939..0dd02bca7 100644 --- a/src/gui/epgplus.h +++ b/src/gui/epgplus.h @@ -33,19 +33,12 @@ #ifndef __EPGPLUS_HPP__ #define __EPGPLUS_HPP__ -#include -#include -#include - -#include "color.h" -#include "channellist.h" -#include "infoviewer.h" -#include "filebrowser.h" - #include "widget/menue.h" #include +class CFrameBuffer; +class Font; class CBouquetList; class ConfigFile; struct button_label; From 105b4dd9e81e09606b9b3ce55867ed1b98bdd4ba Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Wed, 11 Feb 2015 08:41:27 +0100 Subject: [PATCH 16/25] infoviewer.h: replace includes with forward declaration Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/8fcaeda6a4b889e787d28ddd6692e52ad6505d7c Author: Stefan Seyfried Date: 2015-02-11 (Wed, 11 Feb 2015) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/infoviewer.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/gui/infoviewer.h b/src/gui/infoviewer.h index b21ed7d40..ae914a7d0 100644 --- a/src/gui/infoviewer.h +++ b/src/gui/infoviewer.h @@ -36,15 +36,14 @@ #include #include -#include #include -#include #include -#include "widget/menue.h" #include #include #include +class CFrameBuffer; +class COSDFader; class CInfoViewerBB; class CInfoViewer { From f400e72a635f4c244d1910d1174a1ccd445cd66f Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Thu, 12 Feb 2015 16:38:42 +0100 Subject: [PATCH 17/25] channellist: fix lock icon for default-locked bouquets Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/3a222fb5f375fbf163c516efa4356de74ffb5c42 Author: Stefan Seyfried Date: 2015-02-12 (Thu, 12 Feb 2015) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/channellist.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index 85bfdce03..d8af23133 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -2024,7 +2024,7 @@ void CChannelList::paintItem(int pos, const bool firstpaint) void CChannelList::paintHead() { CComponentsHeader header(x, y, full_width, theight, name /*no header icon*/); - if (bouquet && bouquet->zapitBouquet && bouquet->zapitBouquet->bLocked) + if (bouquet && bouquet->zapitBouquet && bouquet->zapitBouquet->bLocked != g_settings.parentallock_defaultlocked) header.setIcon(NEUTRINO_ICON_LOCK); if (edit_state) header.setCaption(std::string(g_Locale->getText(LOCALE_CHANNELLIST_EDIT)) + ": " + name); From 88c7a4f4b482980f3133fa51c4f33848fbaf6a4d Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Sat, 14 Feb 2015 18:42:40 +0100 Subject: [PATCH 18/25] menue.cpp fix CMenuForwarder::setOption set option_string_ptr Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/721cb9bd7494d368b823ce5ed7f6de14361ae336 Author: Jacek Jendrzej Date: 2015-02-14 (Sat, 14 Feb 2015) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/widget/menue.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp index c63bb23a3..3fe9c55d5 100644 --- a/src/gui/widget/menue.cpp +++ b/src/gui/widget/menue.cpp @@ -2070,6 +2070,7 @@ CMenuForwarder::CMenuForwarder(const std::string& Text, const bool Active, const void CMenuForwarder::setOption(const std::string &Option) { option_string = Option; + option_string_ptr = &option_string; } int CMenuForwarder::getWidth(void) From db494a03a37a2fe5ba4be286a43861fb5e09dae2 Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Sun, 15 Feb 2015 12:57:29 +0300 Subject: [PATCH 19/25] eitd: ignore neutrino epg filter, if filter was configured from xml Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/5d9e7a814df1b0b2216aa1610e6cb6a4f555ca16 Author: [CST] Focus Date: 2015-02-15 (Sun, 15 Feb 2015) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/eitd/sectionsd.cpp | 7 ++++++- src/eitd/xmlutil.cpp | 3 ++- src/eitd/xmlutil.h | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/eitd/sectionsd.cpp b/src/eitd/sectionsd.cpp index 51d4809c9..e94ef3a8d 100644 --- a/src/eitd/sectionsd.cpp +++ b/src/eitd/sectionsd.cpp @@ -92,6 +92,7 @@ static int scanning = 1; extern bool epg_filter_is_whitelist; extern bool epg_filter_except_current_next; +static bool xml_epg_filter; static bool messaging_zap_detected = false; /*static*/ bool dvb_time_update = false; @@ -2153,7 +2154,7 @@ bool CEitManager::Start() config.epg_cache, config.epg_extendedcache, config.epg_max_events, config.epg_old_events); printf("[sectionsd] NTP: %s, server %s, command %s\n", ntpenable ? "enabled" : "disabled", ntpserver.c_str(), ntp_system_cmd_prefix.c_str()); - readEPGFilter(); + xml_epg_filter = readEPGFilter(); if (!sectionsd_server.prepare(SECTIONSD_UDS_NAME)) { fprintf(stderr, "[sectionsd] failed to prepare basic server\n"); @@ -2904,6 +2905,8 @@ unsigned CEitManager::getEventsCount() void CEitManager::addChannelFilter(t_original_network_id onid, t_transport_stream_id tsid, t_service_id sid) { OpenThreads::ScopedLock slock(filter_mutex); + if (xml_epg_filter) + return; epg_filter_except_current_next = true; epg_filter_is_whitelist = true; addEPGFilter(onid, tsid, sid); @@ -2912,6 +2915,8 @@ void CEitManager::addChannelFilter(t_original_network_id onid, t_transport_strea void CEitManager::clearChannelFilters() { OpenThreads::ScopedLock slock(filter_mutex); + if (xml_epg_filter) + return; clearEPGFilter(); epg_filter_is_whitelist = false; } diff --git a/src/eitd/xmlutil.cpp b/src/eitd/xmlutil.cpp index 5087cc0d8..056235116 100644 --- a/src/eitd/xmlutil.cpp +++ b/src/eitd/xmlutil.cpp @@ -190,7 +190,7 @@ static void addNoDVBTimelist(t_original_network_id onid, t_transport_stream_id t } } -void readEPGFilter(void) +bool readEPGFilter(void) { xmlDocPtr filter_parser = parseXmlFile(epg_filter_dir.c_str()); @@ -223,6 +223,7 @@ void readEPGFilter(void) } } xmlFreeDoc(filter_parser); + return (CurrentEPGFilter != NULL); } void readDVBTimeFilter(void) diff --git a/src/eitd/xmlutil.h b/src/eitd/xmlutil.h index 91380c996..298bb54c4 100644 --- a/src/eitd/xmlutil.h +++ b/src/eitd/xmlutil.h @@ -37,7 +37,7 @@ void *insertEventsfromFile(void * data); void writeEventsToFile(char *epgdir); -void readEPGFilter(void); +bool readEPGFilter(void); void readDVBTimeFilter(void); bool checkEPGFilter(t_original_network_id onid, t_transport_stream_id tsid, t_service_id sid); bool checkBlacklist(t_channel_id channel_id); From 8eafe936f718634ce830f93f04f0a0e5ba96d5bf Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Sun, 15 Feb 2015 14:52:06 +0100 Subject: [PATCH 20/25] src/gui/osdlang_setup.cpp fix path Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/8655264791a414d0e3a4307f9367a98538f43b6b Author: Jacek Jendrzej Date: 2015-02-15 (Sun, 15 Feb 2015) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/osdlang_setup.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/osdlang_setup.cpp b/src/gui/osdlang_setup.cpp index 433b7b0df..8749b2392 100644 --- a/src/gui/osdlang_setup.cpp +++ b/src/gui/osdlang_setup.cpp @@ -177,7 +177,7 @@ void COsdLangSetup::showLanguageSetup(CMenuWidget *osdl_setup) { struct dirent **namelist; int n; - const char *pfad[] = {DATADIR "/neutrino/locale", CONFIGDIR "/locale"}; + const char *pfad[] = {DATADIR "/neutrino/locale", "/var/tuxbox/locale"}; osdl_setup->addIntroItems(); From 8668aa9ab453a60b240e0ae58082ab2c6d78af4c Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Sun, 15 Feb 2015 18:49:30 +0100 Subject: [PATCH 21/25] src/gui/moviebrowser.cpp set deleted CChannelLogo pointers to NULL Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/cbf4c9bae802f07473cac2500252d417f5ab90f6 Author: Jacek Jendrzej Date: 2015-02-15 (Sun, 15 Feb 2015) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/moviebrowser.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/gui/moviebrowser.cpp b/src/gui/moviebrowser.cpp index 59b06740e..e70b86294 100644 --- a/src/gui/moviebrowser.cpp +++ b/src/gui/moviebrowser.cpp @@ -1261,6 +1261,7 @@ void CMovieBrowser::refreshMovieInfo(void) else CChannelLogo->hide(); delete CChannelLogo; + CChannelLogo = NULL; } if (old_EpgId != m_movieSelectionHandler->epgEpgId >>16) { CChannelLogo = new CComponentsChannelLogo(0, 0, logo_w_max, m_cBoxFrameTitleRel.iHeight, From 9a426f468e7a6c5c25fd01dbc71999aaf820e871 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Sun, 15 Feb 2015 22:16:47 +0100 Subject: [PATCH 22/25] some enum warrnings compil fixes Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/051fb7c008f61e1252a5578f17721fcf2299e5f1 Author: Jacek Jendrzej Date: 2015-02-15 (Sun, 15 Feb 2015) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- lib/libcoolstream2/cs_api.h | 2 +- lib/libcoolstream2/cs_frontpanel.h | 6 ++--- lib/libcoolstream2/dmx_cs.h | 2 +- lib/libcoolstream2/video_cs.h | 2 +- src/gui/buildinfo.h | 2 +- src/gui/components/cc_frm.h | 2 +- src/gui/components/cc_frm_chain.cpp | 2 +- src/gui/components/cc_item_progressbar.h | 4 ++-- src/zapit/include/linux/dvb/frontend.h | 30 ++++++++++++------------ src/zapit/include/zapit/frontend_types.h | 2 +- 10 files changed, 27 insertions(+), 27 deletions(-) diff --git a/lib/libcoolstream2/cs_api.h b/lib/libcoolstream2/cs_api.h index 64b8180bc..6cb6b01a5 100644 --- a/lib/libcoolstream2/cs_api.h +++ b/lib/libcoolstream2/cs_api.h @@ -33,7 +33,7 @@ enum CS_LOG_MODULE { CS_LOG_POWER_CLK, CS_LOG_MEM, CS_LOG_API, - CS_LOG_CA, + CS_LOG_CA }; // Initialization diff --git a/lib/libcoolstream2/cs_frontpanel.h b/lib/libcoolstream2/cs_frontpanel.h index 19360f04f..e6ca97137 100644 --- a/lib/libcoolstream2/cs_frontpanel.h +++ b/lib/libcoolstream2/cs_frontpanel.h @@ -62,7 +62,7 @@ typedef enum { FP_FLAG_ALIGN_LEFT = 0x10, /* align the text in display from the left (default) */ FP_FLAG_ALIGN_RIGHT = 0x20, /* align the text in display from the right (arabic) */ FP_FLAG_UPDATE_SCROLL_POS = 0x40, /* update the current position for scrolling (internal use only) */ - FP_FLAG_USER = 0x80, /* user flags set (internal use only) */ + FP_FLAG_USER = 0x80 /* user flags set (internal use only) */ } fp_flag; typedef struct { @@ -80,7 +80,7 @@ typedef enum { FP_LED_3_ON = 0x88, FP_LED_1_OFF = 0x01, FP_LED_2_OFF = 0x02, - FP_LED_3_OFF = 0x08, + FP_LED_3_OFF = 0x08 } fp_led_ctrl_t; typedef struct { @@ -105,7 +105,7 @@ typedef struct { typedef enum { FP_DISPLAY_TEXT_NONE = 0, FP_DISPLAY_TEXT_LIMITED, - FP_DISPLAY_TEXT_ALL, + FP_DISPLAY_TEXT_ALL } fp_display_text_type_t; typedef enum { diff --git a/lib/libcoolstream2/dmx_cs.h b/lib/libcoolstream2/dmx_cs.h index df105dcff..7dfe830d8 100644 --- a/lib/libcoolstream2/dmx_cs.h +++ b/lib/libcoolstream2/dmx_cs.h @@ -27,7 +27,7 @@ typedef enum { DMX_TS = 0, - DMX_DMA, + DMX_DMA } DMX_TYPE; typedef enum { diff --git a/lib/libcoolstream2/video_cs.h b/lib/libcoolstream2/video_cs.h index 9f15eb8fc..6c1da4931 100644 --- a/lib/libcoolstream2/video_cs.h +++ b/lib/libcoolstream2/video_cs.h @@ -32,7 +32,7 @@ typedef enum { // Output types ANALOG_xD_SCART = (1 << 8), // Output is SCART ANALOG_xD_CINCH = (1 << 9), // Output is Cinch - ANALOG_xD_BOTH = (3 << 8), // Output cannot individually control scart, cinch outputs + ANALOG_xD_BOTH = (3 << 8) // Output cannot individually control scart, cinch outputs // due to limited amount of DACs (ie TANK, Trinity) } analog_mode_t; diff --git a/src/gui/buildinfo.h b/src/gui/buildinfo.h index 14a341232..3ef9377dc 100644 --- a/src/gui/buildinfo.h +++ b/src/gui/buildinfo.h @@ -66,7 +66,7 @@ class CBuildInfo : public CMenuTarget, public CComponentsWindow BI_TYPE_ID_CREATOR, #endif - BI_TYPE_IDS, + BI_TYPE_IDS }; CBuildInfo(); diff --git a/src/gui/components/cc_frm.h b/src/gui/components/cc_frm.h index cd99a0bb3..4736598c8 100644 --- a/src/gui/components/cc_frm.h +++ b/src/gui/components/cc_frm.h @@ -123,7 +123,7 @@ class CComponentsForm : public CComponentsItem { PG_SCROLL_M_UP_DOWN_KEY = 1, PG_SCROLL_M_LEFT_RIGHT_KEY = 2, - PG_SCROLL_M_OFF = 4, + PG_SCROLL_M_OFF = 4 }; ///enable/disable page scroll, parameter1 default enabled for up/down keys virtual void enablePageScroll(const int& mode = PG_SCROLL_M_UP_DOWN_KEY){page_scroll_mode = mode;}; diff --git a/src/gui/components/cc_frm_chain.cpp b/src/gui/components/cc_frm_chain.cpp index 9d451041d..b3f8b9824 100644 --- a/src/gui/components/cc_frm_chain.cpp +++ b/src/gui/components/cc_frm_chain.cpp @@ -77,7 +77,7 @@ void CComponentsFrmChain::setDirection(int direction) { chn_direction = direction; initChainItems(); -}; +} void CComponentsFrmChain::initChainItems() { diff --git a/src/gui/components/cc_item_progressbar.h b/src/gui/components/cc_item_progressbar.h index 03a1996e1..842bcbc63 100644 --- a/src/gui/components/cc_item_progressbar.h +++ b/src/gui/components/cc_item_progressbar.h @@ -137,13 +137,13 @@ class CProgressBar : public CComponentsItem PB_MATRIX, /* 0 */ PB_LINES_V, /* 1 */ PB_LINES_H, /* 2 */ - PB_COLOR, /* 3 */ + PB_COLOR /* 3 */ }; enum pb_type_t { PB_REDLEFT = 0, PB_REDRIGHT, - PB_TIMESCALE, + PB_TIMESCALE }; void setType(pb_type_t type); diff --git a/src/zapit/include/linux/dvb/frontend.h b/src/zapit/include/linux/dvb/frontend.h index c56d77c49..838c05ede 100644 --- a/src/zapit/include/linux/dvb/frontend.h +++ b/src/zapit/include/linux/dvb/frontend.h @@ -141,7 +141,7 @@ typedef enum fe_status { FE_HAS_SYNC = 0x08, FE_HAS_LOCK = 0x10, FE_TIMEDOUT = 0x20, - FE_REINIT = 0x40, + FE_REINIT = 0x40 } fe_status_t; typedef enum fe_spectral_inversion { @@ -164,7 +164,7 @@ typedef enum fe_code_rate { FEC_AUTO, FEC_3_5, FEC_9_10, - FEC_2_5, + FEC_2_5 } fe_code_rate_t; @@ -182,7 +182,7 @@ typedef enum fe_modulation { APSK_16, APSK_32, DQPSK, - QAM_4_NR, + QAM_4_NR } fe_modulation_t; typedef enum fe_transmit_mode { @@ -194,7 +194,7 @@ typedef enum fe_transmit_mode { TRANSMISSION_MODE_16K, TRANSMISSION_MODE_32K, TRANSMISSION_MODE_C1, - TRANSMISSION_MODE_C3780, + TRANSMISSION_MODE_C3780 } fe_transmit_mode_t; #if defined(__DVB_CORE__) || !defined (__KERNEL__) @@ -205,7 +205,7 @@ typedef enum fe_bandwidth { BANDWIDTH_AUTO, BANDWIDTH_5_MHZ, BANDWIDTH_10_MHZ, - BANDWIDTH_1_712_MHZ, + BANDWIDTH_1_712_MHZ } fe_bandwidth_t; #endif @@ -220,7 +220,7 @@ typedef enum fe_guard_interval { GUARD_INTERVAL_19_256, GUARD_INTERVAL_PN420, GUARD_INTERVAL_PN595, - GUARD_INTERVAL_PN945, + GUARD_INTERVAL_PN945 } fe_guard_interval_t; @@ -236,7 +236,7 @@ enum fe_interleaving { INTERLEAVING_NONE, INTERLEAVING_AUTO, INTERLEAVING_240, - INTERLEAVING_720, + INTERLEAVING_720 }; #if defined(__DVB_CORE__) || !defined (__KERNEL__) @@ -380,14 +380,14 @@ struct dvb_frontend_event { typedef enum fe_pilot { PILOT_ON, PILOT_OFF, - PILOT_AUTO, + PILOT_AUTO } fe_pilot_t; typedef enum fe_rolloff { ROLLOFF_35, /* Implied value in DVB-S, default for DVB-S2 */ ROLLOFF_20, ROLLOFF_25, - ROLLOFF_AUTO, + ROLLOFF_AUTO } fe_rolloff_t; typedef enum fe_delivery_system { @@ -409,7 +409,7 @@ typedef enum fe_delivery_system { SYS_DAB, SYS_DVBT2, SYS_TURBO, - SYS_DVBC_ANNEX_C, + SYS_DVBC_ANNEX_C } fe_delivery_system_t; /* backward compatibility */ @@ -421,31 +421,31 @@ typedef enum fe_delivery_system { enum atscmh_sccc_block_mode { ATSCMH_SCCC_BLK_SEP = 0, ATSCMH_SCCC_BLK_COMB = 1, - ATSCMH_SCCC_BLK_RES = 2, + ATSCMH_SCCC_BLK_RES = 2 }; enum atscmh_sccc_code_mode { ATSCMH_SCCC_CODE_HLF = 0, ATSCMH_SCCC_CODE_QTR = 1, - ATSCMH_SCCC_CODE_RES = 2, + ATSCMH_SCCC_CODE_RES = 2 }; enum atscmh_rs_frame_ensemble { ATSCMH_RSFRAME_ENS_PRI = 0, - ATSCMH_RSFRAME_ENS_SEC = 1, + ATSCMH_RSFRAME_ENS_SEC = 1 }; enum atscmh_rs_frame_mode { ATSCMH_RSFRAME_PRI_ONLY = 0, ATSCMH_RSFRAME_PRI_SEC = 1, - ATSCMH_RSFRAME_RES = 2, + ATSCMH_RSFRAME_RES = 2 }; enum atscmh_rs_code_mode { ATSCMH_RSCODE_211_187 = 0, ATSCMH_RSCODE_223_187 = 1, ATSCMH_RSCODE_235_187 = 2, - ATSCMH_RSCODE_RES = 3, + ATSCMH_RSCODE_RES = 3 }; #define NO_STREAM_ID_FILTER (~0U) diff --git a/src/zapit/include/zapit/frontend_types.h b/src/zapit/include/zapit/frontend_types.h index 7e3591c70..3ced4139c 100644 --- a/src/zapit/include/zapit/frontend_types.h +++ b/src/zapit/include/zapit/frontend_types.h @@ -76,7 +76,7 @@ typedef enum { // ALL_SAT = ZAPIT_DM_SAT, ALL_CABLE = ZAPIT_DM_CABLE, - ALL_TERR = ZAPIT_DM_TERR, + ALL_TERR = ZAPIT_DM_TERR } delivery_system_t; typedef enum { From 450e17342e7ce306d566a9846d10965433bca204 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Mon, 16 Feb 2015 22:25:32 +0100 Subject: [PATCH 23/25] CLuaInstance: implement current method for generation of button labels in footer object This controls more effective fontsize and button arrangement. Lua API is not touched. TODO: add more possible buttons. Color buttons for sure are not be enough for some applications. Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/2f96c2653b6cfe231a153097acded36091390f1a Author: Thilo Graf Date: 2015-02-16 (Mon, 16 Feb 2015) ------------------ This commit was generated by Migit --- src/gui/luainstance.cpp | 44 ++++++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 18 deletions(-) diff --git a/src/gui/luainstance.cpp b/src/gui/luainstance.cpp index 505b1a636..ae31a542e 100644 --- a/src/gui/luainstance.cpp +++ b/src/gui/luainstance.cpp @@ -1771,25 +1771,33 @@ int CLuaInstance::CWindowNew(lua_State *L) else { CComponentsFooter* footer = (*udata)->w->getFooterObject(); if (footer) { - int btnCount = 0; - if (!btnRed.empty()) btnCount++; - if (!btnGreen.empty()) btnCount++; - if (!btnYellow.empty()) btnCount++; - if (!btnBlue.empty()) btnCount++; - if (btnCount) { - fb_pixel_t col = footer->getColorBody(); - int btnw = (dx-20) / btnCount; - int btnh = footer->getHeight(); - int start = 10; - if (!btnRed.empty()) - footer->addCCItem(new CComponentsButtonRed(start, CC_CENTERED, btnw, btnh, btnRed, 0, false , true, false, col, col)); - if (!btnGreen.empty()) - footer->addCCItem(new CComponentsButtonGreen(start+=btnw, CC_CENTERED, btnw, btnh, btnGreen, 0, false , true, false, col, col)); - if (!btnYellow.empty()) - footer->addCCItem(new CComponentsButtonYellow(start+=btnw, CC_CENTERED, btnw, btnh, btnYellow, 0, false , true, false, col, col)); - if (!btnBlue.empty()) - footer->addCCItem(new CComponentsButtonBlue(start+=btnw, CC_CENTERED, btnw, btnh, btnBlue, 0, false , true, false, col, col)); + vector buttons; + if (!btnRed.empty()){ + button_label_s btnSred; + btnSred.button = NEUTRINO_ICON_BUTTON_RED; + btnSred.text = btnRed; + buttons.push_back(btnSred); } + if (!btnGreen.empty()){ + button_label_s btnSgreen; + btnSgreen.button = NEUTRINO_ICON_BUTTON_GREEN; + btnSgreen.text = btnGreen; + buttons.push_back(btnSgreen); + } + if (!btnYellow.empty()){ + button_label_s btnSyellow; + btnSyellow.button = NEUTRINO_ICON_BUTTON_YELLOW; + btnSyellow.text = btnYellow; + buttons.push_back(btnSyellow); + } + if (!btnBlue.empty()){ + button_label_s btnSblue; + btnSblue.button = NEUTRINO_ICON_BUTTON_YELLOW; + btnSblue.text = btnBlue; + buttons.push_back(btnSblue); + } + if(!buttons.empty()) + footer->setButtonLabels(buttons, dx-20, (dx-20) / (buttons.size()+1)); } } From 089062571cd733e04f088c3cad0160830a1f1e4b Mon Sep 17 00:00:00 2001 From: vanhofen Date: Thu, 19 Feb 2015 08:57:58 +0100 Subject: [PATCH 24/25] deutsch.locale: upgrade Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/b7fa3d737e0c90a6e6d20cc4613d8ddaf72e3f53 Author: vanhofen Date: 2015-02-19 (Thu, 19 Feb 2015) Origin message was: ------------------ - deutsch.locale: upgrade ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- data/locale/deutsch.locale | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index aaa396090..30ae26407 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -492,6 +492,9 @@ extra.tp_mod_4_nr QAM/4-NR extra.tp_mod_64 QAM/64 extra.tp_mod_8 8PSK extra.tp_mod_auto QAM/AUTO +extra.tp_pilot Pilot +extra.tp_pilot_auto Auto (HW) +extra.tp_pilot_auto_sw Auto (SW) extra.tp_pol Polarisation extra.tp_pol_h H extra.tp_pol_l L @@ -956,6 +959,7 @@ menu.hint_epg_old_events Veraltete EPG-Daten werden nach dieser Zeit (in Stunden menu.hint_epg_read Liest nach einem Neustart die EPG-Daten von einem externen Datenträger wieder ein menu.hint_epg_save Speichert die EPG-Daten beim Herunterfahren auf einem externen Datenträger menu.hint_epg_save_frequently Speichert die EPG-Daten in regelmäßigen Abständen auf einem externen Datenträger +menu.hint_epg_save_mode Speichert die EPG-Daten nur für Sender, die in die Favoriten aufgenommen sind menu.hint_epg_save_standby Speichert die EPG-Daten auch, wenn in den Standby-Modus geschalten wird menu.hint_epg_scan Zu scannende Bouquets wählen. Aktuelles Bouquet beim Umschalten, markierte Bouquets oder alle Favoriten menu.hint_epg_scan_mode Aktivieren Sie den Hintergrundscan der EPG-Daten, wenn ein freier Tuner vorhanden ist @@ -1259,6 +1263,7 @@ menu.hint_scan_motorpos Wählen Sie eine gespeicherten Positions-Nummer für die menu.hint_scan_nid Geben Sie ihre Kabelnetzwerk-ID in dezimal ein menu.hint_scan_nit Lassen Sie Transponder über gesendete NIT-Daten (Network Information Table) hinzufügen menu.hint_scan_pids Duchsucht und speichert auch die Audio-, Video- und PMT-PIDs +menu.hint_scan_pilot Wählen Sie den Pilot-Parameter menu.hint_scan_pol Wählen Sie eine Transponder-Polarisation menu.hint_scan_rate Geben Sie eine Transponder-Symbolrate ein menu.hint_scan_reset_numbers Zurücksetzen der existierender Kanal-Nummern und Umnummerierung nach einen Suchlauf @@ -1352,6 +1357,7 @@ menu.hint_video_dbdr Verwendeter MPEG2 Filter menu.hint_video_format Wählen Sie das Bildschirmformat ihres Fernsehgerätes menu.hint_video_mode Wählen Sie den Modus des Ausgangssignals für den HDMI-Anschluss menu.hint_video_modes Definiert, welche Videosysteme mit der VF-Taste der Fernbedienung ausgewählt werden können +menu.hint_video_modes_auto Definiert, welche Videosysteme automatisch ausgewählt werden können menu.hint_video_pip Bild in Bild Größe und Position menu.hint_video_saturation Change picture saturation menu.hint_video_scart_mode Wählen Sie den Modus des Ausgangssignals für den SCART-Anschluss @@ -1398,6 +1404,7 @@ miscsettings.epg_old_events_hint2 Angabe in Stunden miscsettings.epg_read Gespeicherte EPG-Daten einlesen miscsettings.epg_save EPG zwischenspeichern miscsettings.epg_save_frequently EPG regelmäßig speichern +miscsettings.epg_save_mode Nur Favoriten miscsettings.epg_save_standby EPG speichern in Standby-Modus miscsettings.epg_scan Hintergrundscan EPG miscsettings.epg_scan_always Immer @@ -2275,6 +2282,7 @@ videomenu.dbdr_both deBlock & deRing videomenu.dbdr_deblock deBlock videomenu.dbdr_none aus videomenu.enabled_modes Videosysteme auf der VF-Taste +videomenu.enabled_modes_auto Videosysteme für autom. Wahl videomenu.fullscreen Vollbild videomenu.hdmi_cec CSTLink (HDMI-CEC) videomenu.hdmi_cec_mode Receiver verwenden From 3731854ff0416433854ab50e64900fd8095f889b Mon Sep 17 00:00:00 2001 From: vanhofen Date: Thu, 19 Feb 2015 08:59:53 +0100 Subject: [PATCH 25/25] locals: remove unused stringinput.layout entry Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/d1ca82ab44e9d210df401bd5d49837e12138d513 Author: vanhofen Date: 2015-02-19 (Thu, 19 Feb 2015) Origin message was: ------------------ - locals: remove unused stringinput.layout entry ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/system/locals.h | 1 - src/system/locals_intern.h | 1 - 2 files changed, 2 deletions(-) diff --git a/src/system/locals.h b/src/system/locals.h index fa91e789c..9b768e095 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -2163,7 +2163,6 @@ typedef enum LOCALE_STRINGINPUT_CAPS, LOCALE_STRINGINPUT_CLEAR, LOCALE_STRINGINPUT_INSERT, - LOCALE_STRINGINPUT_LAYOUT, LOCALE_STRINGINPUT_SAVE, LOCALE_SUBTITLES_CHARSET, LOCALE_SUBTITLES_HEAD, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index f27ac324a..0423c1586 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -2163,7 +2163,6 @@ const char * locale_real_names[] = "stringinput.caps", "stringinput.clear", "stringinput.insert", - "stringinput.layout", "stringinput.save", "subtitles.charset", "subtitles.head",